Permalink
Browse files

Clean up the .gitignore file

  • Loading branch information...
1 parent 2ec3b95 commit 53ea78374f65ec7e6eaa7cf4f4ba028a6410f2bb @encukou encukou committed Oct 16, 2011
Showing with 0 additions and 3 deletions.
  1. +0 −3 .gitignore
View
@@ -1,6 +1,4 @@
*.pyc
-<<<<<<< HEAD
-=======
*.vim.sess
*.pyo
*.swp
@@ -9,4 +7,3 @@ CleverCSS.egg-info
build
dist
MANIFEST
->>>>>>> jabapyth/master

0 comments on commit 53ea783

Please sign in to comment.