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

diff --git a/.gitignore b/.gitignore
index 743853bd..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
@@ -79,6 +78,7 @@ a.out.dSYM/
 /uip/mhshow
 /uip/mhstore
 /uip/mhtest
+/uip/mkstemp
 /uip/msgchk
 /uip/msh
 /uip/new