inc patch to produce build with correct NLog dep

Harry180 · Mar 23, 2012 · 9ef960d · 9ef960d
1 parent 6c9ee58
commit 9ef960d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.semver b/.semver
@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 5
-:patch: 0
+:patch: 1
 :special: ""
diff --git a/.semver.orig b/.semver.orig
@@ -0,0 +1,10 @@
+--- 
+:major: 0
+<<<<<<< Updated upstream
+:minor: 5
+:patch: 0
+=======
+:minor: 4
+:patch: 1
+>>>>>>> Stashed changes
+:special: ""