From ebfd23c72d227185ddd93d79571134490f57393d Mon Sep 17 00:00:00 2001 From: Adam Lavin Date: Sun, 1 Sep 2013 06:52:36 +0000 Subject: [PATCH 1/3] I should have updated the development branch .gitignore first... Sorry! --- .gitignore | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 49d6cd59..63520024 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,12 @@ dwsync.xml .CVS intermediate publish -.idea \ No newline at end of file +.idea + +/bootstrap/compiled.php +/vendor +/app/config/production +composer.phar +composer.lock +atlassian-ide-plugin.xml +_ide_helper.php \ No newline at end of file From 4a2f4c5e8931052e49b3b932f55719eb88ac1e06 Mon Sep 17 00:00:00 2001 From: nelsonlaquet Date: Sun, 1 Sep 2013 02:01:01 -0500 Subject: [PATCH 2/3] Temp --- public/styles/{Prettify.css => Prettify-blegh.css} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename public/styles/{Prettify.css => Prettify-blegh.css} (100%) diff --git a/public/styles/Prettify.css b/public/styles/Prettify-blegh.css similarity index 100% rename from public/styles/Prettify.css rename to public/styles/Prettify-blegh.css From c3a6c5d739c72e52aca26d7441bf0a797bea6f96 Mon Sep 17 00:00:00 2001 From: nelsonlaquet Date: Sun, 1 Sep 2013 02:01:12 -0500 Subject: [PATCH 3/3] Fixed casing --- public/styles/{Prettify-blegh.css => prettify.css} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename public/styles/{Prettify-blegh.css => prettify.css} (100%) diff --git a/public/styles/Prettify-blegh.css b/public/styles/prettify.css similarity index 100% rename from public/styles/Prettify-blegh.css rename to public/styles/prettify.css