Added "Conflicted" file state

FossilOrigin-Name: 9d073dbbd5ca3382a184e8693107a01d1c72a754
2014-07-28 12:50:34 +00:00
parent a18be8ddbf
commit 19c4b1ef0d
4 changed files with 14 additions and 10 deletions
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7963dcf290a49ba949e056b48a3af0d0ca133315
+9d073dbbd5ca3382a184e8693107a01d1c72a754