diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-09 14:23:12 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-09 14:23:12 -0400 |
| commit | 9935397d12020c5a52afe9f8f390b5581bef5d03 (patch) | |
| tree | c55fee62f502dab932d92d05941d46f85d48c415 /SharedVersion.cs | |
| parent | 1d14c98ec8fbbccfd53a9fda726c241feb0c35b3 (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 9b3db6668..6dfb8bc40 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6050")] +[assembly: AssemblyVersion("3.1.97")] |