blob: d6b708e8bcdc5243991472e337f6771184c5d57c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
|
<<<<<<< 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
|
