Remove added stuff from merge conflict

DD2480-Group-22 · Feb 27, 2020 · 198be47 · 198be47
1 parent 582c9d5
commit 198be47
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml b/src/main/java/org/jabref/gui/preferences/AppearanceTab.fxml
@@ -29,9 +29,5 @@
     <Label styleClass="sectionHeader" text="%Visual theme"/>
     <RadioButton fx:id="themeLight" text="%Light theme" toggleGroup="$theme"/>
     <RadioButton fx:id="themeDark" text="%Dark theme" toggleGroup="$theme"/>
-<<<<<<< HEAD
-    <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme" />
-=======
     <RadioButton fx:id="customTheme" text="%Custom theme" toggleGroup="$theme"/>
->>>>>>> fixCustomCSSFile
 </fx:root>