Skip to content

Commit

Permalink
Fix merge conflict that I resolved incorrectly
Browse files Browse the repository at this point in the history
  • Loading branch information
ankitkumarr committed Aug 17, 2019
1 parent 8f99a7e commit d17b09e
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions src/Azure.Functions.Cli/Azure.Functions.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,6 @@
<PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage.Internal" Version="1.4.0" />
<PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.5.10246" />
<PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.3" />
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker" Version="0.1.120-preview" />
<PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="2.0.12625" />
<PackageReference Include="Microsoft.Azure.Functions.PythonWorkerRunEnvironments" Version="1.0.0-beta20190816.7" />
<PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker" Version="0.1.152-preview" />
<PackageReference Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="2.0.12641" />
<PackageReference Include="Microsoft.Azure.Functions.PythonWorkerRunEnvironments" Version="1.0.0-beta20190816.7" />
Expand Down

0 comments on commit d17b09e

Please sign in to comment.