1 Commits

Author	SHA1	Message	Date
WolfTreak	0aecdf7255	Possible solution to zabapgit merge functionality to resolve conflicts (#1407) ... * Merging per Textfile * Add files via upload * Delete WolfTreak_ABAPGIT_Merging * Refactoring vom Coding, Darstellung verbessert * Merging page changed and also merging class extended to instance and conflict methods added * Refactoring for Travis * Refactoring for Travis * Escaping of merged content functions now correct	2018-05-27 16:20:43 +02:00