Added additional text merge backends.

2016-05-22 15:40:47 -04:00
parent c7f02f027a
commit 7c945d6ba7
18 changed files with 1055 additions and 3 deletions
@@ -46,7 +46,6 @@ namespace merge
 		// Object duplication
 		/////////////////////////////////
 	public:
-		static QString id();
 		TextCsv* clone() const;


@@ -54,6 +53,7 @@ namespace merge
 		// Static methods
 		/////////////////////////////////
 	public:
+		static QString id();
 		static Merge* create();

 	};