Fixed major conflict

IMPORTANT: don’t edit the same FXML file lol
CS2103AUG2017-W15-B3 · Oct 20, 2017 · 4cf84c8 · 4cf84c8
1 parent 97c6725
commit 4cf84c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 34 deletions.
diff --git a/src/main/java/seedu/address/ui/MainWindow.java b/src/main/java/seedu/address/ui/MainWindow.java
@@ -49,9 +49,6 @@ public class MainWindow extends UiPart<Region> {
     private DeleteButton deleteButton;
     private EmailButton emailButton;
 
-    @FXML
-    private VBox vBox;
-
     @FXML
     private StackPane browserPlaceholder;
 

diff --git a/src/main/resources/view/MainWindow.fxml b/src/main/resources/view/MainWindow.fxml
@@ -18,17 +18,10 @@
 
   <MenuBar fx:id="menuBar" VBox.vgrow="NEVER">
     <Menu mnemonicParsing="false" text="File">
-<<<<<<< HEAD
       <MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
          <MenuItem mnemonicParsing="false" onAction="#handleBlackTheme" text="Black Theme" />
          <MenuItem mnemonicParsing="false" onAction="#handleWhiteTheme" text="White Theme" />
          <MenuItem mnemonicParsing="false" onAction="#handleGreenTheme" text="Green Theme" />
-=======
-      <MenuItem mnemonicParsing="false" onAction="#handleBlackTheme" text="Black Theme"/>
-            <MenuItem mnemonicParsing="false" onAction="#handleWhiteTheme" text="White Theme"/>
-            <MenuItem mnemonicParsing="false" onAction="#handleGreenTheme" text="Green Theme"/>
-            <MenuItem mnemonicParsing="false" onAction="#handleExit" text="Exit" />
->>>>>>> origin/v1.2-Implementing-Google-maps-+-extra-UI-elements
     </Menu>
     <Menu mnemonicParsing="false" text="Help">
       <MenuItem fx:id="helpMenuItem" mnemonicParsing="false" onAction="#handleHelp" text="Help" />
@@ -67,29 +60,7 @@
         <Insets bottom="10" left="10" right="10" top="10" />
       </padding>
     </StackPane>
+  </SplitPane>
 
-    <StackPane fx:id="resultDisplayPlaceholder" maxHeight="100" minHeight="100" prefHeight="100"
-               styleClass="pane-with-border" VBox.vgrow="NEVER">
-        <padding>
-            <Insets bottom="5" left="10" right="10" top="5"/>
-        </padding>
-    </StackPane>
-
-    <SplitPane id="splitPane" fx:id="splitPane" dividerPositions="0.4" VBox.vgrow="ALWAYS">
-        <VBox fx:id="personList" minWidth="340" prefWidth="340" SplitPane.resizableWithParent="false">
-            <padding>
-                <Insets bottom="10" left="10" right="10" top="10"/>
-            </padding>
-            <StackPane fx:id="personListPanelPlaceholder" VBox.vgrow="ALWAYS"/>
-            <StackPane fx:id="deleteButtonPlaceholder" prefHeight="48.0" prefWidth="322.0"/>
-        </VBox>
-
-        <StackPane fx:id="browserPlaceholder" prefWidth="340">
-            <padding>
-                <Insets bottom="10" left="10" right="10" top="10"/>
-            </padding>
-        </StackPane>
-    </SplitPane>
-
-    <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER"/>
+  <StackPane fx:id="statusbarPlaceholder" VBox.vgrow="NEVER" />
 </VBox>