still trying this merge

This commit is contained in:
Keivan
2010-09-27 20:58:32 -07:00
parent 7712fa514d
commit 9515c8788a
4 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ Thumbs.db
obj/
[Rr]elease*/
_ReSharper*/
[Tt]est[Rr]esult
[Tt]est[Rr]esult[s]
#NZBDrone specific
nzbdrone.db