Remove conflict(8).

[nmh] / .gitignore

diff --git a/.gitignore b/.gitignore
index b8e0d4685dc4bcfdd05b4e2fb958273a227d6995..e3335a9ba464ace313c8120bd951cea5a8f8f58e 100644 (file)
--- 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