Skip to content

Commit

Permalink
Fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
wtfsck committed Sep 27, 2017
1 parent e29fb57 commit 68d412e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions de4dot.code/deobfuscators/Agile_NET/vm/v2/CsvmResources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@
<value>CSVM5.bin;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="CSVM6" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\..\..\Resources\CSVM6.bin;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>CSVM6.bin;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
</root>

0 comments on commit 68d412e

Please sign in to comment.