Removed old pictures.

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index e1ee3d7..a1e817b 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -25,12 +25,9 @@ SOURCES += main.cpp \
     ui/infotab.cpp \
     ui/updatelocation/updatelocationdialog.cpp \
     ui/updatelocation/texteditautoresizer.cpp \
-<<<<<<< HEAD
-    user/user.cpp
-=======
+    user/user.cpp \
     ui/buttonitem.cpp \
     ui/situareuser.cpp
->>>>>>> personalInfo
 HEADERS += ui/mainwindow.h \
     ui/mapviewscreen.h \
     ui/listviewscreen.h \