diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-02 18:26:29 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-02 18:26:29 -0500 |
| commit | 895f4a1be4900842cc3411e587f3bcd527a55532 (patch) | |
| tree | b2659f1c0079e89b092b5956d652cf29c0afebbd | |
| parent | e76d198a868ab4ce7b3a94e4d17eb459030e4d6e (diff) | |
fix merge conflict
| -rw-r--r-- | SharedVersion.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 8517afe6f..e0732b997 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5800.2")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5784.0")] |