diff options
| author | Michael Merickel <michael@merickel.org> | 2014-08-06 11:59:45 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2014-08-06 11:59:45 -0500 |
| commit | 9279468d0e4d411652a735e28839bd8a5504ced6 (patch) | |
| tree | 580c1efc1044325a20a242a212d647b81cde6088 /HACKING.txt | |
| parent | 407b335ed9954c042377fd2e060c36edcd07cf60 (diff) | |
| parent | 3587a53dc28b8f6411816ccd7fd8fdee0d88acb4 (diff) | |
| download | pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.gz pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.tar.bz2 pyramid-9279468d0e4d411652a735e28839bd8a5504ced6.zip | |
Merge branch 'master' into feature.override-asset-with-absolute-path
Diffstat (limited to 'HACKING.txt')
| -rw-r--r-- | HACKING.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/HACKING.txt b/HACKING.txt index 460d02047..1386be3af 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -31,7 +31,7 @@ By Hand $ cd hack-on-pyramid # Configure remotes such that you can pull changes from the Pyramid # repository into your local repository. - $ git remote add upstream git@github.com:Pylons/pyramid.git + $ git remote add upstream https://github.com:Pylons/pyramid.git # fetch and merge changes from upstream into master $ git fetch upstream $ git merge upstream/master @@ -149,7 +149,7 @@ Coding Style ------------ - PEP8 compliance. Whitespace rules are relaxed: not necessary to put - 2 newlines between classes. But 80-column lines, in particular, are + 2 newlines between classes. But 79-column lines, in particular, are mandatory. See http://docs.pylonsproject.org/en/latest/community/codestyle.html for more information. |