diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-27 16:37:52 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-27 16:37:52 -0500 |
| commit | 3ec2e0771e1c64638960a0e78fce91dd63f8351f (patch) | |
| tree | d64350009091d54e452f498ef9d98f85f457a69a /.gitignore | |
| parent | 4e7c29f94a3283311771cb2129f570a7c53631a3 (diff) | |
| parent | ea262045fbf26c153e6e4c46b5b67ad296cda8c1 (diff) | |
Merge ../twentyeleven-child
Conflicts:
.gitignore
Makefile
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 9 insertions, 0 deletions
@@ -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 |