From 20cd1ac4c575c728b8716d2730e556fcf5db5228 Mon Sep 17 00:00:00 2001
From: mallocator <mallox@pyxzl.net>
Date: Thu, 7 Mar 2013 10:54:10 -0800
Subject: [PATCH] - Merged conflict in gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0592392
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/target
+.DS_Store