delete autor

77c4f75a · Ahmed · 69591ad6 · 723e69f1 · 77c4f75a
Commit 77c4f75a authored Apr 21, 2020 by Ahmed
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

src/main/java/de/monticore/lang/monticar/generator/cpp/converter/ComponentConverter.java .../monticar/generator/cpp/converter/ComponentConverter.java +0 -6

No files found.
--- a/src/main/java/de/monticore/lang/monticar/generator/cpp/converter/ComponentConverter.java
+++ b/src/main/java/de/monticore/lang/monticar/generator/cpp/converter/ComponentConverter.java
@@ -26,12 +26,6 @@ import java.util.*;
 import java.util.stream.Collectors;

 /**
-<<<<<<< master
-=======
- * @author Sascha Schneiders
- * @author Ahmed Diab
->>>>>>> fix some bugs
- * Handles code generation for a component and its "subsymbols"
 */
 public class ComponentConverter {