diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-29 11:59:37 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-29 11:59:37 -0400 |
| commit | 100236f416e1917d57913f117b7f0c4ee9069d0b (patch) | |
| tree | b0231521d10a130c232e4717fc76953903239210 | |
| parent | 40530f729301ba3c7c631ef082a96955cfb4e256 (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 d81f6c71c..7f78e641a 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6010")] +[assembly: AssemblyVersion("3.1.81")] |