From 6db31b6c3acaf73feb790656422d6fb4e93b89ed Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Sat, 20 Apr 2013 08:28:07 +0200
Subject: Fix merge markers

---
 plugins/org.eclipse.emf.cdo.ui/plugin.properties | 92 ------------------------
 1 file changed, 92 deletions(-)

diff --git a/plugins/org.eclipse.emf.cdo.ui/plugin.properties b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
index 5f2e30da63..3873d2a658 100644
--- a/plugins/org.eclipse.emf.cdo.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.cdo.ui/plugin.properties
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Copyright (c) 2004 - 2012 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
@@ -90,94 +89,3 @@ _UI_Menu_About_label = Editor &About...
 _UI_About_title = Editor Application
 _UI_About_text = Editor Application about box goes here.
 
-=======
-# Copyright (c) 2004 - 2012 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:
-#    Eike Stepper - initial API and implementation
-
-pluginName = CDO Model Repository Client UI
-providerName = Eclipse Modeling Project
-
-_UI_CreateChild_menu_item = &New Child
-_UI_CreateSibling_menu_item = N&ew Sibling
-_UI_ShowPropertiesView_menu_item = Show &Properties View
-_UI_RefreshViewer_menu_item = &Refresh
-_UI_SelectionPage_label = Selection
-_UI_NoObjectSelected = Selected Nothing
-_UI_SingleObjectSelected = Selected Object: {0}
-_UI_MultiObjectSelected = Selected {0} Objects
-_UI_OpenEditorError_label = Open Editor
-_UI_Wizard_category = Example EMF Model Creation Wizards
-_UI_CreateModelError_message = Problems encountered in file "{0}"
-_UI_Wizard_label = New
-_WARN_FilenameExtension = The file name must end in ".{0}"
-_UI_ModelObject = Model Object
-_UI_XMLEncoding = XML Encoding
-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
-_UI_Wizard_initial_object_description = Select a model object to create
-_UI_FileConflict_label = File Conflict
-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
-
-_UI_EditorEditor_menu = &Editor Editor
-_UI_ParentPage_label = Parent
-_UI_ListPage_label = List
-_UI_TreePage_label = Tree
-_UI_TablePage_label = Table
-_UI_TreeWithColumnsPage_label = Tree with Columns
-_UI_ObjectColumn_label = Object
-_UI_SelfColumn_label = Self
-_UI_EditorModelWizard_label = Editor Model
-_UI_EditorModelWizard_description = Create a new Editor model
-_UI_EditorEditor_label = Editor Model Editor
-_UI_EditorEditorFilenameDefaultBase = My
-_UI_EditorEditorFilenameExtension = editor
-
-_UI_CDOEditor_menu = &CDO Editor
-_UI_CDOModelWizard_label = CDO Model
-_UI_CDOModelWizard_description = Create a new CDO model
-_UI_CDOEditor_label = CDO Model Editor
-_UI_CDOEditorFilenameDefaultBase = My
-_UI_CDOEditorFilenameExtension = cdo
-
-_UI_CDOLabelDecorator_description = Decorates CDOObject with several features like state, CDOID, ...
-_UI_CDOLabelDecorator_label = CDOObject Label Decorator
-
-
-_UI_CDOEditorFilenameExtensions = cdo
-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
-
-category.name.0 = CDO
-view.name.0 = CDO Sessions
-view.name.1 = CDO Watch List
-view.name.2 = CDO Remote Sessions
-editor.name.0 = CDO Editor
-page.name.0 = CDO
-page.name.1 = User Interface
-perspective.name = CDO Explorer
-_UI_EditorEditorAdvisor_ActionSet_label = Editor Action Set
-_UI_Perspective_label = Editor
-
_UI_Browse_label = &Browse...
-_UI_File_label = &File
-_UI_Question_title = Question
-_UI_Error_title = Error
-_WARN_No_Editor = There is no editor registered for the file "{0}".
-
_UI_Application_title = Editor Application
-_UI_Menu_File_label = &File
-_UI_Menu_New_label = &New
-_UI_Menu_Open_label = &Open...
-_UI_Menu_Open_description = Opens a model object file
-_UI_Menu_OpenURI_label = &Open URI...
-_UI_Menu_OpenURI_description = Opens a model object loading it from a URI
-_UI_Menu_Edit_label = &Edit
-_UI_Menu_Window_label = &Window
-_UI_Menu_Help_label = &Help
-_UI_Menu_About_label = Editor &About...
-_UI_About_title = Editor Application
-_UI_About_text = Editor Application about box goes here.
-
->>>>>>> master
-- 
cgit v1.2.3