summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore11
1 files changed, 1 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index d6b708e..0135378 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# DO NOT EDIT, this file is automatically made by `Makefile'
#
# ignore everyting
@@ -10,17 +9,9 @@ img/*
!style.scss
!header.php.patch
!logo-style.scss.php
-!license.txt
!css_shadow.php
!twentyeleven-fix.scss
-!.gitignore
-!theme.mk
-=======
-# ignore everyting
-*
-# but these:
!license.txt
-!twentyeleven-fix.scss
!.gitignore
->>>>>>> ea262045fbf26c153e6e4c46b5b67ad296cda8c1
+!theme.mk
!Makefile