private.properties 897 Bytes
Newer Older
1
compile.on.save=true
Stephen's avatar
Merged    
Stephen committed
2

Stephen's avatar
Stephen committed
3
user.properties.file=C:\\Users\\Stephen\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
Susanti Gojali's avatar
Susanti Gojali committed
4
<<<<<<< HEAD
Stephen's avatar
Stephen committed
5
6
=======
<<<<<<< HEAD
Susanti Gojali's avatar
Susanti Gojali committed
7
<<<<<<< HEAD
melvinfonda's avatar
melvinfonda committed
8
user.properties.file=C:\\Users\\user\\AppData\\Roaming\\NetBeans\\8.0\\build.properties
melvinfonda's avatar
melvinfonda committed
9
=======
melvinfonda's avatar
melvinfonda committed
10
11
<<<<<<< HEAD
=======
Stephen's avatar
Merged    
Stephen committed
12

melvinfonda's avatar
melvinfonda committed
13
>>>>>>> 2e2ad538abfe623e38cc24be02c48f5ad2ee0768
Susanti Gojali's avatar
Susanti Gojali committed
14
user.properties.file=C:\\Users\\susanti_2\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
melvinfonda's avatar
melvinfonda committed
15
>>>>>>> 43e41c8c08f84039568ca701a584f38f9911e548
Susanti Gojali's avatar
Susanti Gojali committed
16
17
=======

Susanti Gojali's avatar
Susanti Gojali committed
18
19
20
<<<<<<< HEAD
user.properties.file=C:\\Users\\susanti_2\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
=======
Susanti Gojali's avatar
Susanti Gojali committed
21
user.properties.file=C:\\Users\\susanti_2\\AppData\\Roaming\\NetBeans\\8.0.2\\build.properties
Susanti Gojali's avatar
Susanti Gojali committed
22
>>>>>>> f5cc2615451f416ad94e5b85c35aa84513a123d3
Susanti Gojali's avatar
Susanti Gojali committed
23
>>>>>>> 9b3bab9e9eefddca873933beff1cff411b869149
Stephen's avatar
Stephen committed
24
>>>>>>> 4425b3f14619792ceebdcdb264cb7c61d1d9d38c
Susanti Gojali's avatar
Susanti Gojali committed
25
26
=======
>>>>>>> 7d12ee92a34d06c0f223c1804ac375528b1b069d