Permalink
Browse files

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

Conflicts:
	.gitignore

Signed-off-by: Patrick Magee <patrick.magee@live.co.uk>
  • Loading branch information...
2 parents 0aa0c07 + 70df7b9 commit 1f5b00b14fd296c6d22ae5c66df0aae76d0074f3 @pjmagee committed May 6, 2012
Showing with 12 additions and 1 deletion.
  1. +10 −1 .gitignore
  2. +2 −0 README.md
View
11 .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
View
2 README.md
@@ -0,0 +1,2 @@
+4chandownloader
+===============

0 comments on commit 1f5b00b

Please sign in to comment.