merge error

xbmc · Dec 6, 2015 · 8f7ea7c · 8f7ea7c
1 parent 7aa4008
commit 8f7ea7c
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -117,7 +117,6 @@
 #include "filesystem/SFTPFile.h"
 #endif
 #include "PartyModeManager.h"
-#endif
 #include "network/ZeroconfBrowser.h"
 #ifndef TARGET_POSIX
 #include "threads/platform/win/Win32Exception.h"