diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-29 17:21:00 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-29 17:21:00 -0500 |
| commit | cce6aeb35102e8d65310224640ae7d23d5494ade (patch) | |
| tree | 35851ef90dba61b2acd83a451132514e76bb53fc /.gitignore | |
| parent | be061c84635f986d7d81eae2f45c3f0765bc6711 (diff) | |
Somewhere in there .gitignore got fouled up by a merge. Regenerate.
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 1 insertions, 10 deletions
@@ -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 |