Why does this keep getting reverted on my merges!

This commit is contained in:
Djamil Legato
2014-09-06 15:31:45 -07:00
parent bfb5a74197
commit da0fafa800
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
# Composer
composer.lock
.composer
vendor/
# Sass

View File

@@ -23,7 +23,7 @@ cache:
enabled: true # Set to true to enable caching
check:
method: file # Method to check for updates in pages: file|folder|none
driver: auto # One of: auto|file|apc|xcache|memcache|memcached|wincache
driver: auto # One of: auto|file|apc|xcache|memcache|wincache
prefix: 'g' # Cache prefix string (prevents cache conflicts)
twig: