fixed some derps with merge conflicts

master
Zak Peirce 8 years ago
parent b0e91b5569
commit 3d23b540ba
  1. 4
      libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
  2. 2
      libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
  3. 2
      libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java

@ -32,7 +32,6 @@ public class NetworkSettingsCommand {
private String urlRedirectCustomUrl; private String urlRedirectCustomUrl;
private String urlRedirectType; private String urlRedirectType;
private int port; private int port;
<<<<<<< HEAD
private boolean toast; private boolean toast;
public void setPortForwardingEnabled(boolean portForwardingEnabled) { public void setPortForwardingEnabled(boolean portForwardingEnabled) {
@ -74,7 +73,6 @@ public class NetworkSettingsCommand {
this.port = port; this.port = port;
} }
<<<<<<< HEAD
public boolean isToast() { public boolean isToast() {
return toast; return toast;
} }
@ -83,8 +81,6 @@ public class NetworkSettingsCommand {
this.toast = toast; this.toast = toast;
} }
=======
public String getUrlRedirectType() { public String getUrlRedirectType() {
return urlRedirectType; return urlRedirectType;
} }

@ -82,7 +82,6 @@ public class DLNASettingsController {
settingsService.save(); settingsService.save();
upnpService.setMediaServerEnabled(dlnaEnabled); upnpService.setMediaServerEnabled(dlnaEnabled);
} }
<<<<<<< HEAD
public void setSettingsService(SettingsService settingsService) { public void setSettingsService(SettingsService settingsService) {
this.settingsService = settingsService; this.settingsService = settingsService;
@ -92,4 +91,3 @@ public class DLNASettingsController {
this.upnpService = upnpService; this.upnpService = upnpService;
} }
} }
=======

@ -82,7 +82,6 @@ public class SonosSettingsController {
sonosService.setMusicServiceEnabled(false); sonosService.setMusicServiceEnabled(false);
sonosService.setMusicServiceEnabled(sonosEnabled); sonosService.setMusicServiceEnabled(sonosEnabled);
} }
<<<<<<< HEAD
public void setSettingsService(SettingsService settingsService) { public void setSettingsService(SettingsService settingsService) {
this.settingsService = settingsService; this.settingsService = settingsService;
@ -92,4 +91,3 @@ public class SonosSettingsController {
this.sonosService = sonosService; this.sonosService = sonosService;
} }
} }
=======

Loading…
Cancel
Save