diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-18 00:43:37 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-18 00:43:37 -0500 |
| commit | 4853e795d7210137da031fc790ad95b04d6ad043 (patch) | |
| tree | e131be3570452f6c8d21e3f974c4178fa9c98de2 /SharedVersion.cs | |
| parent | bc58e2862cefb8a7bfc4bed8198fde5c3aed1714 (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 47dd5098a..0561738e2 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.8500")] +[assembly: AssemblyVersion("3.1.259")] |