X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/060475000a2c096fbcab4a028832af774df1ee7b..94b8e5d6c0fff813de5da91558aaebf1df8c816e:/.gitignore

diff --git a/.gitignore b/.gitignore
index b8e0d468..e3335a9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,6 @@ a.out.dSYM/
 /uip/ap
 /uip/burst
 /uip/comp
-/uip/conflict
 /uip/dist
 /uip/dp
 /uip/flist