1 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index d348d80..d6b708e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # DO NOT EDIT, this file is automatically made by `Makefile'
 # 
 # ignore everyting
@@ -14,4 +15,12 @@ img/*
 !twentyeleven-fix.scss
 !.gitignore
 !theme.mk
+=======
+# ignore everyting
+*
+# but these:
+!license.txt
+!twentyeleven-fix.scss
+!.gitignore
+>>>>>>> ea262045fbf26c153e6e4c46b5b67ad296cda8c1
 !Makefile