summaryrefslogtreecommitdiffstats
path: root/src/com.gluster.storage.management.console/plugin.xml
diff options
context:
space:
mode:
authorDhandapani <dhandapani@gluster.com>2011-08-17 16:09:00 +0530
committerDhandapani <dhandapani@gluster.com>2011-08-17 16:09:00 +0530
commitf02f719cf28dea27923ad04dd7c1c50ea49933ff (patch)
treeaef636b8b41b3814baeeaaf0485d11530b6fc1ac /src/com.gluster.storage.management.console/plugin.xml
parent54e55c446d871325de23269623968a196d881fbf (diff)
conflict fixes
Diffstat (limited to 'src/com.gluster.storage.management.console/plugin.xml')
-rw-r--r--src/com.gluster.storage.management.console/plugin.xml11
1 files changed, 1 insertions, 10 deletions
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"