From 1fb5ad47f452ebc1dad26366ff3d89b854c7cd4d Mon Sep 17 00:00:00 2001
From: Ivan Zuzak <izuzak@gmail.com>
Date: Thu, 27 Mar 2014 17:04:02 +0100
Subject: [PATCH] fixup OpenCart double-file situation

---
 OpenCart.gitignore |  4 ++++
 opencart.gitignore | 10 ----------
 2 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 opencart.gitignore

diff --git a/OpenCart.gitignore b/OpenCart.gitignore
index f3179125..6d72b17d 100644
--- a/OpenCart.gitignore
+++ b/OpenCart.gitignore
@@ -1,5 +1,9 @@
 .htaccess
 config.php
+admin/config.php
+
+!index.html
+
 download/
 image/data/
 image/cache/
diff --git a/opencart.gitignore b/opencart.gitignore
deleted file mode 100644
index c673f1f8..00000000
--- a/opencart.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-config.php
-admin/config.php
-
-!index.html
-
-download
-image/cache/*.jpg
-image/cache/data/*
-system/cache
-system/logs