Remove merge conflict in system.properties

ethereumj-core/src/main/resources/system.properties

@@ -32,7 +32,6 @@ peer.discovery.port = 30303
 # peer.discovery.port = 40404
 
 
-
 # active peer ip and port
 # that is the peer through
 # we get the chain: [54.201.28.117] port: [30303]
@@ -66,22 +65,13 @@ peer.discovery.timeout = 2
 # retrieved from the peer [seconds]
 transaction.approve.timeout = 5
 
-<<<<<<< HEAD
-=======
 # default directory where we keep
 # basic Serpent samples relative
 # to home.dir
 samples.dir = samples
 
->>>>>>> merge
 # everytime the application starts
 # the existing database will be 
 # destroyed and all the data will be 
 # downloaded from peers again
-<<<<<<< HEAD
 database.reset = true
-
-
-=======
-database.reset = true
->>>>>>> merge