From f02f719cf28dea27923ad04dd7c1c50ea49933ff Mon Sep 17 00:00:00 2001
From: Dhandapani <dhandapani@gluster.com>
Date: Wed, 17 Aug 2011 16:09:00 +0530
Subject: conflict fixes

---
 src/com.gluster.storage.management.console/plugin.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/com.gluster.storage.management.console/plugin.xml')

diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml
index 675b7e52..9cadd537 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/com.gluster.storage.management.console/plugin.xml
@@ -175,15 +175,6 @@
             name="Tasks"
             restorable="true">
       </view>
-      <view
-            allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="org.eclipse.tm.internal.terminal.view.TerminalView"
-            icon="icons/tango/16x16/utilities-terminal.png"
-            id="com.gluster.storage.management.console.views.TerminalView"
-            name="Terminal"
-            restorable="true">
-      </view>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
@@ -1419,7 +1410,7 @@
          </view>
          <view
                closeable="true"
-               id="com.gluster.storage.management.console.views.TerminalView"
+               id="org.eclipse.tm.terminal.view.TerminalView"
                minimized="false"
                moveable="false"
                ratio="0.60f"
-- 
cgit