diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-17 12:32:48 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-17 12:32:48 -0400 |
| commit | f8a248ffd805b810e90bc5ec0619e53f49ebcae5 (patch) | |
| tree | c86b9bd5191c1ae9d50498869bc0f0808286a1bd | |
| parent | 734d215940da0f3e4e40f68126b5525907198035 (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 8cdb3e6b5..697d0fa9f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.8100")] +[assembly: AssemblyVersion("3.1.192")] |