added gitignore to ignore stupid caspar backup files
authorMart Lubbers <mart@martlubbers.net>
Thu, 13 Nov 2014 19:15:12 +0000 (20:15 +0100)
committerMart Lubbers <mart@martlubbers.net>
Thu, 13 Nov 2014 19:15:12 +0000 (20:15 +0100)
.gitignore [new file with mode: 0644]
caspartest [deleted file]
caspartest~ [deleted file]

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