code layout adjustment

core/merginapi.h

@@ -670,13 +670,13 @@ class MerginApi: public QObject
     void apiSupportsWorkspacesChanged();
 
     void serverWasUpgraded();
-<<<<<<< HEAD
+    <<< <<< < HEAD
     void projectRoleUpdated( const QString &projectFullName, const QString &role );
-=======
-    void networkManagerChanged();
+    == == == =
+      void networkManagerChanged();
 
     void downloadItemRetried( const QString &projectFullName, int retryCount );
->>>>>>> master
+    >>> >>> > master
 
   private slots:
     void listProjectsReplyFinished( QString requestId );
@@ -823,7 +823,7 @@ class MerginApi: public QObject
 
     bool projectFileHasBeenUpdated( const ProjectDiff &diff );
 
-<<<<<<< HEAD
+    <<< <<< < HEAD
     //! Checks if retrieving the project role from the server was successful and
     //! if it differs from the current project role, emits a signal with new project role
     void reloadProjectRoleReplyFinished();
@@ -835,9 +835,9 @@ class MerginApi: public QObject
     QString getCachedProjectRole( const QString &projectFullName ) const;
 
     QNetworkAccessManager mManager;
-=======
-    QNetworkAccessManager *mManager = nullptr;
->>>>>>> master
+    == == == =
+      QNetworkAccessManager * mManager = nullptr;
+    >>> >>> > master
     QString mApiRoot;
     LocalProjectsManager &mLocalProjects;
     QString mDataDir; // dir with all projects