Fixed a few merge problems

[situare] / .gitignore

diff --git a/.gitignore b/.gitignore
index 37bdac3..b4e92d8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,6 @@ Situare
 *.orig
 doc/doxygen/*
 situare
-testtabs
+mainwindow_test
+qrc_images.cpp
+