Updating merge

Author: yoavrubin

src/ResourceManager/Sql/Commands.Sql.Test/packages.config

@@ -6,12 +6,8 @@
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="0.19.2-preview" targetFramework="net45" />
-<<<<<<< HEAD
   <package id="Microsoft.Azure.Management.Sql" version="0.35.0-prerelease" targetFramework="net45" />
-=======
->>>>>>> 29f96291588e6153aedba905ca788cf9ef5acff5
   <package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Sql" version="0.32.0-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5687.28567-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5687.28567-prerelease" targetFramework="net45" />

src/ResourceManager/Sql/Commands.Sql/packages.config

@@ -4,12 +4,8 @@
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Authentication" version="1.1.3-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
-<<<<<<< HEAD
-  <package id="Microsoft.Azure.Management.Sql" version="0.35.0-prerelease" targetFramework="net45" />
-=======
->>>>>>> 29f96291588e6153aedba905ca788cf9ef5acff5
   <package id="Microsoft.Azure.Management.Resources" version="2.18.4-preview" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Sql" version="0.32.0-prerelease" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Sql" version="0.35.0-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="2.4.0-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />