Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2013-05-13 04:32:34 -0400
committerHenrik Rentz-Reichert2013-05-13 04:32:34 -0400
commit002856970fba66e8a6b027155bb6ef7a1863ff66 (patch)
tree8ca1ae3d6a6d32d5b7bcc31f96eda3ec66088d77
parent3dedc9c2206f21e0edd232f8b9f2fe99d9169669 (diff)
downloadorg.eclipse.etrice-002856970fba66e8a6b027155bb6ef7a1863ff66.tar.gz
org.eclipse.etrice-002856970fba66e8a6b027155bb6ef7a1863ff66.tar.xz
org.eclipse.etrice-002856970fba66e8a6b027155bb6ef7a1863ff66.zip
[core.etmap] update of xtend-gen file
-rw-r--r--plugins/org.eclipse.etrice.core.etmap/xtend-gen/org/eclipse/etrice/core/etmap/generator/ETMapGenerator.java11
1 files changed, 0 insertions, 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;

Back to the top