update// added idgenerator and resolved mergeconflicts

2020-05-09 22:03:55 +02:00
parent e34742b5dc
commit 6c4ee63b72
3 changed files with 46 additions and 1 deletions
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -999,7 +999,6 @@ void Controller::refreshTransactions() {
                            );
                    //DataStore::getChatDataStore()->setData(chatModel->generateChatItemID(item), item);
                    DataStore::getChatDataStore()->setData(ChatIDGenerator::getInstance()->generateID(item), item);
-
                 } 
            }