From 002856970fba66e8a6b027155bb6ef7a1863ff66 Mon Sep 17 00:00:00 2001
From: Henrik Rentz-Reichert
Date: Mon, 13 May 2013 10:32:34 +0200
Subject: [core.etmap] update of xtend-gen file

---
 .../eclipse/etrice/core/etmap/generator/ETMapGenerator.java   | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java b/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java
index f7040920c..8823eb1b7 100644
--- a/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java
+++ b/plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java
@@ -1,16 +1,5 @@
 /**
-<<<<<<< HEAD
  * generated by Xtext
-=======
- * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * CONTRIBUTORS:
- * 		Henrik Rentz-Reichert (initial contribution)
->>>>>>> refs/remotes/origin/CGenPhysical
  */
 package org.eclipse.etrice.core.etmap.generator;
 
-- 
cgit v1.2.3