Contacts: import via csv file

src/model/AddressBookModel.cpp

@@ -182,6 +182,7 @@ QMap<QString, QString> AddressBookModel::readCSV(const QString &path) {
     QString csv = Utils::barrayToString(Utils::fileOpen(path));
     QTextStream stream(&csv);
     QMap<QString, QString> map;
+<<<<<<< HEAD
 <<<<<<< HEAD
 
     while(!stream.atEnd()) {
@@ -197,10 +198,17 @@ QMap<QString, QString> AddressBookModel::readCSV(const QString &path) {
 =======
     while(!stream.atEnd()) {
         QStringList line = stream.readLine().split(",");
+=======
+    while(!stream.atEnd()) {
+        QStringList line = stream.readLine().split(",");
+>>>>>>> Contacts: import via csv file
         QString name = line.at(0);
         QString address = line.at(1);
         if(!name.isEmpty() && !address.isEmpty()) {
             map[name] = address;
+<<<<<<< HEAD
+>>>>>>> Contacts: import via csv file
+=======
 >>>>>>> Contacts: import via csv file
         }
     }