Skip to content

Commit

Permalink
fixes another rebase conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@thoemmi
thoemmi committed Jun 6, 2020
1 parent 00deed5 commit 8c0b81f
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions 7Zip4Powershell/7Zip4Powershell.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
</ItemGroup>

<ItemGroup>
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Libs\System.Management.Automation.dll</HintPath>
<Reference Include="System.Management.Automation">
<HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\WindowsPowerShell\3.0\System.Management.Automation.dll</HintPath>
<SpecificVersion>false</SpecificVersion>
<Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Libs\System.Management.Automation.dll</HintPath>
Expand Down

0 comments on commit 8c0b81f

Please sign in to comment.