Permalink
Browse files

Update master

  • Loading branch information...
1 parent 0107d39 commit 115ceaba252dbf101cf36f9346c24f13d0e2f8ff @reno- reno- committed Jun 6, 2012
Showing with 0 additions and 9 deletions.
  1. +0 −9 .gitignore
View
@@ -1,12 +1,3 @@
.DS_Store
tapemovie-lib/externals_OSX
-<<<<<<< HEAD
tapemovie-lib/filepaths.txt
-<<<<<<< HEAD
-=======
-tapemovie-lib/filepaths.txt
->>>>>>> .gitignore
-=======
-
-tapemovie-lib/filepaths.txt
->>>>>>> .gitignore

0 comments on commit 115ceab

Please sign in to comment.