Conflicts:
	build.gradle
	src/main/java/kieker/diagnosis/Main.java
	src/main/java/kieker/diagnosis/domain/AbstractOperationCall.java
	src/main/java/kieker/diagnosis/mainview/Controller.java
	src/main/java/kieker/diagnosis/model/importer/stages/AggregatedTraceStatisticsDecorator.java
	src/main/java/kieker/diagnosis/model/importer/stages/OperationCallAggregator.java
	src/main/java/kieker/diagnosis/model/importer/stages/TraceReconstructor.java
	src/main/resources/locale/kieker/diagnosis/mainview/dialog/about/aboutdialogview.properties
	src/main/resources/locale/kieker/diagnosis/mainview/dialog/about/aboutdialogview_de.properties
	src/main/resources/locale/kieker/diagnosis/mainview/subview/aggregatedcalls/aggregatedcallsview.properties
	src/main/resources/locale/kieker/diagnosis/mainview/subview/aggregatedcalls/aggregatedcallsview_de.properties
	src/main/resources/locale/kieker/diagnosis/mainview/subview/aggregatedtraces/aggregatedtracesview.properties
	src/main/resources/locale/kieker/diagnosis/mainview/subview/aggregatedtraces/aggregatedtracesview_de.properties
	src/main/resources/locale/kieker/diagnosis/mainview/subview/calls/callsview.properties
	src/main/resources/locale/kieker/diagnosis/mainview/subview/calls/callsview_de.properties
	src/main/resources/locale/kieker/diagnosis/mainview/subview/traces/tracesview.properties
	src/main/resources/locale/kieker/diagnosis/mainview/subview/traces/tracesview_de.properties
	src/test/java/kieker/diagnosis/domain/AbstractOperationCallTest.java

This reverts commit bf79b185.

Conflicts:
	build.gradle