<<<<<<< HEAD # DO NOT EDIT, this file is automatically made by `Makefile' # # ignore everyting * # but these: !img img/* !img/swoosh.svg !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 !Makefile