From f8514462b804ac8e0a087b4986237b6ec872b1dc Mon Sep 17 00:00:00 2001
From: David Winterbottom <david.winterbottom@gmail.com>
Date: Tue, 26 Apr 2011 16:03:08 +0100
Subject: [PATCH] Tided up gitignore, and removed old FEATURES file

---
 .gitignore                                    |  1 +
 FEATURES.rst                                  | 29 -------------------
 .../fixtures/.~lock.books.csv#                |  1 -
 .../fixtures/.~lock.sample.csv#               |  1 -
 4 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 FEATURES.rst
 delete mode 100644 oscar/apps/catalogue_import/fixtures/.~lock.books.csv#
 delete mode 100644 oscar/apps/catalogue_import/fixtures/.~lock.sample.csv#

diff --git a/.gitignore b/.gitignore
index ed63bc03983..52345f2feab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ oscar/include
 oscar/lib
 oscar/src
 oscar/share
+.~lock.*
diff --git a/FEATURES.rst b/FEATURES.rst
deleted file mode 100644
index ba6170c0e69..00000000000
--- a/FEATURES.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-Countdowns
-----------
-
-Create a new ``oscar.merchandising`` app and add a feature (similar to promos) for having 
-product countdowns.  This is so a client can create a new page using the ``django.contrib.flatpages``
-app and add a product countdown to it.
-
-* A countdown is defined by a title, the page URL it is found on, a description and a list of ordered products
-* A countdown can be added to any page
-* A context processor is needed to add the bindings to the page
-* A template tag is needed to render any page "merchandising" within the page - this should be in the generic
-  flatpages template
-
-
-Merchandising blocks
---------------------
-
-Similar to countdowns.  These should allow an admin to add any numbers of "blocks" to a single page
-and control the order of them.
-
-* A block is defined by a list of products together with a title, a description, an optional link
-  to another part of the site. 
-* The order of the products within the block should be controllable
-
-
-
-
-
-  
\ No newline at end of file
diff --git a/oscar/apps/catalogue_import/fixtures/.~lock.books.csv# b/oscar/apps/catalogue_import/fixtures/.~lock.books.csv#
deleted file mode 100644
index 22849bb8c24..00000000000
--- a/oscar/apps/catalogue_import/fixtures/.~lock.books.csv#
+++ /dev/null
@@ -1 +0,0 @@
-david ,david,earth,26.04.2011 10:32,file:///home/david/.openoffice.org/3;
\ No newline at end of file
diff --git a/oscar/apps/catalogue_import/fixtures/.~lock.sample.csv# b/oscar/apps/catalogue_import/fixtures/.~lock.sample.csv#
deleted file mode 100644
index 507361c0a86..00000000000
--- a/oscar/apps/catalogue_import/fixtures/.~lock.sample.csv#
+++ /dev/null
@@ -1 +0,0 @@
-david ,david,earth,26.04.2011 10:11,file:///home/david/.openoffice.org/3;
\ No newline at end of file