From a895d470c29cb4cc1281559d246e95a9d4743f40 Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Tue, 14 Mar 2017 11:34:23 -0700
Subject: [PATCH] fix bad conflict resolution in bab93e7

fixes #357
going on the record as still baffled why there was even a conflict for the zuseflat merge to resolve
---
 sys/zuse.hoon | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/zuse.hoon b/sys/zuse.hoon
index 822de05d87..5dd137c761 100644
--- a/sys/zuse.hoon
+++ b/sys/zuse.hoon
@@ -3426,7 +3426,7 @@
     |%
     ::                                                  ::  ++abet:lusk:differ
     ++  abet                                            ::
-      =?  q.rag  =([& 0] p.rag)  [p.rag q.rag]
+      =?  q.rag  !=([& 0] p.rag)  [p.rag q.rag]
       (flop q.rag)
     ::                                                  ::  ++done:lusk:differ
     ++  done                                            ::