1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
<<<<<<< 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
|
