diff --git a/.gitignore b/.gitignore
index 3ce6712..b266d1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
-<<<<<<< HEAD
+# Temp files
+*~
+
 # Prerequisites
 *.d