- fix merge edit problem

Author: ritzalam

bigbluebutton-web/grails-app/conf/bigbluebutton.properties

@@ -86,7 +86,7 @@ disableRecordingDefault=false
 #----------------------------------------------------
 # This URL is where the BBB client is accessible. When a user sucessfully
 # enters a name and password, she is redirected here to load the client.
-bigbluebutton.web.serverURL=http://192.168.0.235
+bigbluebutton.web.serverURL=http://192.168.0.249
 
 #----------------------------------------------------
 # Assign URL where the logged-out participant will be redirected after sign-out.
@@ -100,11 +100,7 @@ defaultClientUrl=${bigbluebutton.web.serverURL}/client/BigBlueButton.html
 apiVersion=0.8
 
 # Salt which is used by 3rd-party apps to authenticate api calls
-<<<<<<< HEAD
-securitySalt=a341928c51987806a26ffb0f46c0993b
-=======
-securitySalt=5952641a16e8437374ef363a8c9dbbc3
->>>>>>> upstream/master
+securitySalt=90ae86441b1211a4cbb3671f369fb031
 
 # Directory where we drop the <meeting-id-recorded>.done file
 recordStatusDir=/var/bigbluebutton/recording/status/recorded