1 files changed, 8 insertions, 20 deletions
diff --git a/server.policy b/server.policy
index 224e0c6..e07e45d 100644
--- a/server.policy
+++ b/server.policy
@@ -1,20 +1,8 @@
-<<<<<<< HEAD
-grant { 
-   permission java.io.FilePermission "<<ALL FILES>>","execute, read, write";
-   permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute";
-   permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute";
-   permission java.net.SocketPermission "*:1024-","connect,accept,resolve";
-   permission java.net.SocketPermission "localhost:1050","connect,accept,resolve";
-   permission java.util.PropertyPermission "id3.default_language", "read";
-   permission java.util.PropertyPermission "id3.default_encoding", "read";
-};
-=======
-grant { 
-   permission java.io.FilePermission "<<ALL FILES>>","execute, read, write";
-   permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute";
-   permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute";
-   permission java.net.SocketPermission "*:1024-","connect,accept,resolve";
-   permission java.util.PropertyPermission "id3.default_language", "read";
-   permission java.util.PropertyPermission "id3.default_encoding", "read";
-};
->>>>>>> c62ff958823168d7622b397609220db8b67fa731
+grant { 
+   permission java.io.FilePermission "<<ALL FILES>>","execute, read, write";
+   permission java.io.FilePermission "C:\\Programme\\VideoLAN\\VLC\\vlc","execute";
+   permission java.io.FilePermission "/Applications/VLC.app/Contents/MacOS/VLC","execute";
+   permission java.net.SocketPermission "*:1024-","connect,accept,resolve";
+   permission java.util.PropertyPermission "id3.default_language", "read";
+   permission java.util.PropertyPermission "id3.default_encoding", "read";
+};