diff options
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,9 @@ +<<<<<<< HEAD +syntax: glob + +*.pyc +*~ +======= *.py[cod] # C extensions @@ -33,3 +39,4 @@ nosetests.xml .mr.developer.cfg .project .pydevproject +>>>>>>> 2f856c6503ca4ede2d0853470326731620232557 |