diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-27 16:27:35 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-27 16:27:35 -0500 |
| commit | 61b167106a3a12e081e9a6378ce7d1abc2ae228c (patch) | |
| tree | 39ab02c575e8f77ef0736eef956543b634d2bbdd /.gitignore | |
| parent | d374918177e9464b1eb1af76ca332f78d004f7db (diff) | |
| parent | 0dfce348e4d118ed19bbcf8396a3f7b90fb0badc (diff) | |
Merge ../twentyeleven-child
Conflicts:
.gitignore
Makefile
twentyeleven-fix.scss
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3,8 +3,6 @@ # ignore everyting * # but these: -!.gitignore -!Makefile !license.txt !twentyeleven-fix.scss !style.scss @@ -14,3 +12,6 @@ !header.php.patch !single.php.patch !content-single.php +!.gitignore +!theme.mk +!Makefile |