Merge pull request #15 from dawguk/misc/fixes

Misc/fixes
10REM · Jan 18, 2017 · 1d07aca · 1d07aca
2 parents 019425a + 941c5ae
commit 1d07aca
Show file tree

Hide file tree

Showing 3 changed files with 302 additions and 276 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,3 @@
-<<<<<<< HEAD
 .idea/
 vendor/
-<<<<<<< HEAD
-composer.lock
-=======
->>>>>>> 09d8383ef35d34b295a950b43bec75d3891eb6a6
-=======
 composer.phar
-vendor/
-.idea/
-composer.lock
->>>>>>> 4baef86989c5dff3fc2e290230885a72a6142535
diff --git a/composer.lock b/composer.lock