Merge branch 'master' of github.com:pjmagee/4chandownloader

Conflicts: .gitignore Signed-off-by: Patrick Magee <patrick.magee@live.co.uk>
pjmagee · May 6, 2012 · 1f5b00b · 1f5b00b
2 parents 0aa0c07 + 70df7b9
commit 1f5b00b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # ignore directories created for the build process
 bin/*
 obj/*
@@ -14,4 +15,12 @@ obj/*
 [Tt]humbs.db 
 _ReSharper.*
 *.resharper
-Ankh.NoLoad
+Ankh.NoLoad
+=======
+# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
+bin
+obj
+
+# mstest test results
+TestResults
+>>>>>>> 70df7b970f18bbdef12d089e3a366b152bb16d32
diff --git a/README.md b/README.md
@@ -0,0 +1,2 @@
+4chandownloader
+===============