Merge ../twentyeleven-child

Conflicts:
	.gitignore
	Makefile

3 files changed, 11 insertions, 3 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
diff --git a/Makefile b/Makefile
index b17979b..7df9dba 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ PNGCRUSH = $(firstword $(call pathsearch,pngcrush) $(call pathsearch,cp))
 default: all
 
 include theme.mk
+srcfiles += twentyeleven-fix.scss license.txt
 srcfiles += .gitignore theme.mk Makefile
 
 all: .gitignore $(targets)
diff --git a/theme.mk b/theme.mk
index 0c62d19..dfc72e8 100644
--- a/theme.mk
+++ b/theme.mk
@@ -3,9 +3,7 @@ srcfiles = \
 	style.scss \
 	header.php.patch \
 	logo-style.scss.php \
-	license.txt \
-	css_shadow.php \
-	twentyeleven-fix.scss
+	css_shadow.php
 
 targets = header.php style.css img/swoosh.png