diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-01 02:10:25 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-01 02:10:25 -0400 |
| commit | 05b052789493a3da747443f11cd40db9867cfd0e (patch) | |
| tree | b8d74523329c6e6be49705ec532d9e49773f1cbb /SharedVersion.cs | |
| parent | 0f7a26ecc176ce97de631247a955a1b5df86d2d7 (diff) | |
fix merge conflict
Diffstat (limited to 'SharedVersion.cs')
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 31dd78395..c4dd38332 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5980")] +[assembly: AssemblyVersion("3.1.50")] |