# Conflicts: # Directory.Packages.props # build/packages.lock.json # src/SharpCompress/Common/Zip/WinzipAesEncryptionData.cs # src/SharpCompress/SharpCompress.csproj # src/SharpCompress/packages.lock.json # tests/SharpCompress.Performance/packages.lock.json # tests/SharpCompress.Test/SharpCompress.Test.csproj # tests/SharpCompress.Test/packages.lock.json |
||
|---|---|---|
| .. | ||
| build.csproj | ||
| packages.lock.json | ||
| Program.cs | ||