private.properties 1.29 KB
Newer Older
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
1
compile.on.save=true
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
2
<<<<<<< HEAD
Hendro Triokta Brianto's avatar
edited    
Hendro Triokta Brianto committed
3
user.properties.file=C:\\Users\\Muldani\\AppData\\Roaming\\NetBeans\\8.0\\build.properties
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
4
=======
5
6
7
8
do.depend=false
do.jar=true
javac.debug=true
javadoc.preview=true
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
9
<<<<<<< HEAD
10
user.properties.file=C:\\Users\\adwisatya\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
11
>>>>>>> 04823b63b9f2c28b26cb17c952c01af12445db86
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
12
=======
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
13
<<<<<<< HEAD
Diah Fauziah's avatar
te    
Diah Fauziah committed
14
user.properties.file=C:\\Users\\A450LC W8\\AppData\\Roaming\\NetBeans\\8.0.1\\build.properties
Diah Fauziah's avatar
te    
Diah Fauziah committed
15
16
=======
<<<<<<< HEAD
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
17
<<<<<<< HEAD
Hendro Triokta Brianto's avatar
tes map    
Hendro Triokta Brianto committed
18
user.properties.file=C:\\Users\\Muldani\\AppData\\Roaming\\NetBeans\\8.0\\build.properties
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
19
20
21
=======
user.properties.file=C:\\Users\\adwisatya\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
>>>>>>> 846a002feca14ab7d6058bfcf9f213207284eb19
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
22
=======
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
23
<<<<<<< HEAD
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
24
user.properties.file=C:\\Users\\Muldani\\AppData\\Roaming\\NetBeans\\8.0\\build.properties
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
25
=======
Diah Fauziah's avatar
te    
Diah Fauziah committed
26
<<<<<<< HEAD
Diah Fauziah's avatar
te    
Diah Fauziah committed
27
user.properties.file=C:\\Users\\A450LC W8\\AppData\\Roaming\\NetBeans\\8.0.1\\build.properties
Diah Fauziah's avatar
te    
Diah Fauziah committed
28
=======
Hendro Triokta Brianto's avatar
fix    
Hendro Triokta Brianto committed
29
user.properties.file=C:\\Users\\Muldani\\AppData\\Roaming\\NetBeans\\8.0\\build.properties
Diah Fauziah's avatar
te    
Diah Fauziah committed
30
>>>>>>> 02323e945e52f7a247d213f954c360232adc5b0e
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
31
>>>>>>> 43edd7f388dc28ed09074436ded7167fffce2bcf
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
32
>>>>>>> 08b39e9ffc058e8856fd1186a9d3fbe46d951054
Diah Fauziah's avatar
te    
Diah Fauziah committed
33
>>>>>>> 7535768837b115ec28ff939840e034428f76d0e4
Hendro Triokta Brianto's avatar
Hendro Triokta Brianto committed
34
>>>>>>> 9cf8cc92b1f06ffdc470698a2939c6b717268ad1