Resolve merge conflict

qgis · Sep 18, 2018 · a041c50 · a041c50
1 parent d838d63
commit a041c50
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/app/pluginmanager/qgspluginsortfilterproxymodel.h b/src/app/pluginmanager/qgspluginsortfilterproxymodel.h
@@ -29,8 +29,7 @@ const int PLUGIN_ERROR_ROLE = Qt::UserRole + 5;        // for filtering
 const int PLUGIN_STATUS_ROLE = Qt::UserRole + 6;       // for filtering and sorting
 const int PLUGIN_DOWNLOADS_ROLE = Qt::UserRole + 7;    // for sorting
 const int PLUGIN_VOTE_ROLE = Qt::UserRole + 8;         // for sorting
-const int PLUGIN_REPOSITORY_ROLE = Qt::UserRole + 9;   // for sorting
-const int PLUGIN_ISDEPRECATED_ROLE = Qt::UserRole + 10; // for styling
+const int PLUGIN_ISDEPRECATED_ROLE = Qt::UserRole + 9; // for styling
 const int SPACER_ROLE = Qt::UserRole + 20;  // for sorting