From: Mart Lubbers <mart@martlubbers.net>
Date: Thu, 13 Nov 2014 19:15:12 +0000 (+0100)
Subject: added gitignore to ignore stupid caspar backup files
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=d987cba62967d67eb7cb4350421e284a7829d582;p=ker1415-1.git

added gitignore to ignore stupid caspar backup files
---

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b25c15b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/caspartest b/caspartest
deleted file mode 100644
index d72b235..0000000
--- a/caspartest
+++ /dev/null
@@ -1 +0,0 @@
-hallo dit is raar
diff --git a/caspartest~ b/caspartest~
deleted file mode 100644
index 2024b2d..0000000
--- a/caspartest~
+++ /dev/null
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-hallo dit is raar
-=======
-hoi neger
->>>>>>> 066f320c3074b4208de85c8b555c4c7408452b4f