diff options
| author | Andre Dietisheim | 2009-08-12 11:36:36 +0000 |
|---|---|---|
| committer | Andre Dietisheim | 2009-08-12 11:36:36 +0000 |
| commit | 6a4fd7c6bd8080717d4faf7ce7b5528a53f02f91 (patch) | |
| tree | 85cb3b0a12982b5da7f7271b8094637a25d82771 /plugins/org.eclipse.emf.cdo.ui.defs | |
| parent | 5efcf4ef844299ad4caecf57902f1b83b3607b5c (diff) | |
| download | cdo-6a4fd7c6bd8080717d4faf7ce7b5528a53f02f91.tar.gz cdo-6a4fd7c6bd8080717d4faf7ce7b5528a53f02f91.tar.xz cdo-6a4fd7c6bd8080717d4faf7ce7b5528a53f02f91.zip | |
merge errors removed
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui.defs')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.genmodel | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.genmodel b/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.genmodel index 7b349d1489..129686dfe7 100644 --- a/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.genmodel +++ b/plugins/org.eclipse.emf.cdo.ui.defs/model/org.eclipse.emf.cdo.ui.defs.genmodel @@ -1,17 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" -<<<<<<< org.eclipse.emf.cdo.ui.defs.genmodel xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.
 * 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:
 * Andre Dietisheim - initial API and implementation
" modelDirectory="/org.eclipse.emf.cdo.ui.defs/src" modelPluginID="org.eclipse.emf.cdo.ui.defs" modelName="Org.eclipse.emf.cdo.ui" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel#//defs ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//defs ../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel#//defs"> -======= - xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.cdo.ui.defs/src" - editDirectory="" editorDirectory="" modelPluginID="org.eclipse.emf.cdo.ui.defs" - modelName="Org.eclipse.emf.cdo.ui" testsDirectory="" importerID="org.eclipse.emf.importer.ecore" - complianceLevel="5.0" copyrightFields="false" usedGenPackages="../../org.eclipse.emf.cdo.defs/model/org.eclipse.emf.cdo.defs.genmodel#//cdodefs ../../org.eclipse.net4j.util.defs/model/org.eclipse.net4j.util.defs.genmodel#//net4jutildefs ../../org.eclipse.net4j.defs/model/org.eclipse.net4j.defs.genmodel#//net4jdefs"> ->>>>>>> 1.2 <foreignModel>org.eclipse.emf.cdo.ui.defs.ecore</foreignModel> <genPackages prefix="CDOUIDefs" basePackage="org.eclipse.emf.cdo.ui" disposableProviderFactory="true" ecorePackage="org.eclipse.emf.cdo.ui.defs.ecore#/"> |