Fixed merge conflict

[easylist] / .gitignore

diff --git a/.gitignore b/.gitignore
index 85846b1..3f1fde1 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ moc_*
 easylist
 easylist.exe
 ui*
+Makefile*
+*.pro.user