Resolved merge conflict on gradle.properties file

Author: akshaysonvane

examples/disconnected-project/gradle.properties

@@ -114,26 +114,19 @@ mlFinalSchemasForestsPerHost=1
 mlHubUserRole=data-hub-role
 mlHubUserName=data-hub-user
 # this password is autogenerated for you via the 'gradle hubInit' task
-<<<<<<< HEAD
-mlHubUserPassword=^=-xQ@>Lz+Yclh^lD=O[
-=======
 mlHubUserPassword=_RK6_vC*eR9J&6<PEE6V
 
 # The name of the role to create for hub deployment/development
 mlHubAdminRole=hub-admin-role
 mlHubAdminUserName=hub-admin-user
 mlHubAdminUserPassword=o@r*'.2HAt(3iAoXR/*v
->>>>>>> develop
 
 # Deprecated property
 # If you are working with a load balancer please indicate so using
 # property "mlIsHostLoadBalancer"
 # When "mlIsHostLoadBalancer" is set to "true", the value specified for "mlHost" will be used as the load balancer.
 # You do not need to explicitly set the value of "mlLoadBalancerHosts" but if you do it must match the value of the property "mlHost"
 # mlLoadBalancerHosts=your-load-balancer-hostname
-<<<<<<< HEAD
-=======
 
 # Default module permissions which allow data-hub-role to execute flows
 mlModulePermissions=rest-reader,read,rest-writer,insert,rest-writer,update,rest-extension-user,execute,data-hub-role,read,data-hub-role,execute
->>>>>>> develop