diff options
Diffstat (limited to 'server.policy')
| -rw-r--r-- | server.policy | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/server.policy b/server.policy index 224e0c6..5ff3c7e 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 |