diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-22 16:47:35 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-22 16:47:35 -0400 |
| commit | 821d6731113d63dd340b8b7f45e6c1698e005393 (patch) | |
| tree | 98011e09918c517d25426491e5be8a87943845db | |
| parent | 90127597690f98e95bb3bfb59a6cd0315f64e14b (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 c122e6db7..660e04d02 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5990")] +[assembly: AssemblyVersion("3.1.73")] |