Commit 9ad30549 authored by Michael Schwarz's avatar Michael Schwarz 🤔
Browse files

Renamed conflict graph to conflict trace

parent 8648d393
...@@ -171,7 +171,7 @@ public class MultiPageEditor extends MultiPageEditorPart implements ...@@ -171,7 +171,7 @@ public class MultiPageEditor extends MultiPageEditorPart implements
editor.getDocument(); editor.getDocument();
conflictGraphView = new CupConflictGraphView(composite, jumper, editor); conflictGraphView = new CupConflictGraphView(composite, jumper, editor);
addPage(CONFLICT_GRAPH_PAGE_INDEX, composite); addPage(CONFLICT_GRAPH_PAGE_INDEX, composite);
setPageText(CONFLICT_GRAPH_PAGE_INDEX, "Conflict Graph"); setPageText(CONFLICT_GRAPH_PAGE_INDEX, "Conflict Trace");
} }
protected void createPages() { protected void createPages() {
......
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