guard patches

ohac · Dec 5, 2009 · 7db2ea1 · 7db2ea1
1 parent 7a408d1
commit 7db2ea1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/series b/series
@@ -1,16 +1,16 @@
 stdout.patch
 stdout2.patch
-ffi.patch
+ffi.patch #+conflict
 ffi2.patch #+conflict
 specfail.patch #+conflict
 pp.patch #+old
 pp2.patch #+old
 pp3.patch #+old
 memwidth.patch #+old
-ffisetprmpt.patch
+ffisetprmpt.patch #+conflict
 friendsauto.patch
 shortcut2.patch
-streamdbg3.patch
+streamdbg3.patch #+depend
 shortcut3.patch
 typableid.patch
 anotherstdout.patch