Fix previous merge

diverse-project · Apr 8, 2015 · 27c4baa · 27c4baa
1 parent 990ecb9
commit 27c4baa
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/...ria.diverse.melange/src/main/java/fr/inria/diverse/melange/processors/AspectsCopier.xtend b/...ria.diverse.melange/src/main/java/fr/inria/diverse/melange/processors/AspectsCopier.xtend
@@ -1,22 +1,16 @@
 package fr.inria.diverse.melange.processors
 
+import com.google.inject.Inject
 import fr.inria.diverse.melange.ast.MetamodelExtensions
 import fr.inria.diverse.melange.metamodel.melange.Metamodel
 import fr.inria.diverse.melange.utils.AspectCopier
-import javax.inject.Inject
-<<<<<<< HEAD
-=======
-import org.apache.log4j.Logger
-import org.eclipse.xtext.common.types.JvmDeclaredType
->>>>>>> aspects-type-group
 import org.eclipse.xtext.xbase.jvmmodel.JvmTypeReferenceBuilder
 
 class AspectsCopier extends DispatchMelangeProcessor
 {
 	@Inject AspectCopier copier
 	@Inject extension MetamodelExtensions
 	@Inject JvmTypeReferenceBuilder.Factory builderFactory
-<<<<<<< HEAD
 
 	def dispatch void preProcess(Metamodel mm) {
 		if (!mm.isGeneratedByMelange || mm.runtimeHasBeenGenerated) {