Skip to content
GitLab
Commit 77c4f75a authored by Ahmed's avatar Ahmed
Browse files

delete autor

parents 69591ad6 723e69f1
Pipeline #270727 passed with stage
in 12 minutes and 1 second
Hide whitespace changes
Inline Side-by-side
src/main/java/de/monticore/lang/monticar/generator/cpp/converter/ComponentConverter.java
View file @ 77c4f75a
......@@ -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 {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment