diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-03 20:24:41 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-03 20:24:41 -0400 |
| commit | ac62ba9e19c3620873b1c04a26c183a891f26e59 (patch) | |
| tree | 7412e2a3ece7c5aa35bd1a6f95d7ba77610122e4 | |
| parent | 3be72e195ebd7cf0b679b8c82b7d21d87192d1ac (diff) | |
fix merge conflict
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 42bbcbd8c..bd39b8131 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5983")] +[assembly: AssemblyVersion("3.1.56")] |