Fixed issue where conflicted files could not be reverted

FossilOrigin-Name: 48ee3014e8868c79f7b8639a9110a24e5743d184
2014-08-26 12:30:14 +00:00
parent 08a822e0cd
commit aec85389f1
3 changed files with 9 additions and 9 deletions
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6aae13994552e35d6bac4e0936b032a1179c1466
+48ee3014e8868c79f7b8639a9110a24e5743d184