Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Initial commit

Initial commit
  • Loading branch information...
commit d46c19324f29dde6c914c8a0b66ce647e918dc8a 1 parent a17f176
@maartenba authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 Sources/BrewBuddy/BrewBuddy.Web/BrewBuddy.Web.Publish.xml
View
6 Sources/BrewBuddy/BrewBuddy.Web/BrewBuddy.Web.Publish.xml
@@ -1 +1,5 @@
-<publishData><publishProfile profileName="brewbuddy - Web Deploy" publishMethod="MSDeploy" publishUrl="waws-prod-am2-001.publish.azurewebsites.windows.net:443" msdeploySite="brewbuddy" userName="$brewbuddy" userPWD="hZ1Gis7mZcivglhn3CXmf10Go8TcpHpKNeyFMshlptFqE8qw1DXddpBh8SKR" destinationAppUrl="http://brewbuddy.azurewebsites.net" SQLServerDBConnectionString="" mySQLDBConnectionString="" hostingProviderForumLink="" controlPanelLink="http://windows.azure.com"><databases/></publishProfile><publishProfile profileName="brewbuddy - FTP" publishMethod="FTP" publishUrl="ftp://waws-prod-am2-001.ftp.azurewebsites.windows.net/site/wwwroot" ftpPassiveMode="True" userName="brewbuddy\$brewbuddy" userPWD="hZ1Gis7mZcivglhn3CXmf10Go8TcpHpKNeyFMshlptFqE8qw1DXddpBh8SKR" destinationAppUrl="http://brewbuddy.azurewebsites.net" SQLServerDBConnectionString="" mySQLDBConnectionString="" hostingProviderForumLink="" controlPanelLink="http://windows.azure.com"><databases/></publishProfile></publishData>
+<<<<<<< HEAD
+<publishData><publishProfile profileName="brewbuddy - Web Deploy" publishMethod="MSDeploy" publishUrl="waws-prod-am2-001.publish.azurewebsites.windows.net:443" msdeploySite="brewbuddy" userName="$brewbuddy" userPWD="hZ1Gis7mZcivglhn3CXmf10Go8TcpHpKNeyFMshlptFqE8qw1DXddpBh8SKR" destinationAppUrl="http://brewbuddy.azurewebsites.net" SQLServerDBConnectionString="" mySQLDBConnectionString="" hostingProviderForumLink="" controlPanelLink="http://windows.azure.com"><databases/></publishProfile><publishProfile profileName="brewbuddy - FTP" publishMethod="FTP" publishUrl="ftp://waws-prod-am2-001.ftp.azurewebsites.windows.net/site/wwwroot" ftpPassiveMode="True" userName="brewbuddy\$brewbuddy" userPWD="hZ1Gis7mZcivglhn3CXmf10Go8TcpHpKNeyFMshlptFqE8qw1DXddpBh8SKR" destinationAppUrl="http://brewbuddy.azurewebsites.net" SQLServerDBConnectionString="" mySQLDBConnectionString="" hostingProviderForumLink="" controlPanelLink="http://windows.azure.com"><databases/></publishProfile></publishData>
+=======
+<publishData><publishProfile profileName="brewbuddy - Web Deploy" publishMethod="MSDeploy" publishUrl="waws-prod-am2-001.publish.azurewebsites.windows.net:443" msdeploySite="brewbuddy" userName="$brewbuddy" userPWD="hZ1Gis7mZcivglhn3CXmf10Go8TcpHpKNeyFMshlptFqE8qw1DXddpBh8SKR" destinationAppUrl="http://brewbuddy.azurewebsites.net" SQLServerDBConnectionString="" mySQLDBConnectionString="" hostingProviderForumLink="" controlPanelLink="http://windows.azure.com"><databases/></publishProfile><publishProfile profileName="brewbuddy - FTP" publishMethod="FTP" publishUrl="ftp://waws-prod-am2-001.ftp.azurewebsites.windows.net/site/wwwroot" ftpPassiveMode="True" userName="brewbuddy\$brewbuddy" userPWD="" destinationAppUrl="http://brewbuddy.azurewebsites.net" SQLServerDBConnectionString="" mySQLDBConnectionString="" hostingProviderForumLink="" controlPanelLink="http://windows.azure.com"><databases/></publishProfile></publishData>
+>>>>>>> Initial commit
Please sign in to comment.
Something went wrong with that request. Please try again.