diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 16:41:54 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 16:41:54 -0500 |
| commit | 03118de6b7ef7d0269f030621351aeac5d29d5b1 (patch) | |
| tree | 472c8709c52162f260e51e8896d3e8a1a7fde11b | |
| parent | 6eb5d34af1d081b9e99928a42b2c2699d1d0116d (diff) | |
fix merge conflict
| -rw-r--r-- | SharedVersion.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 5fd088228b..6b204d2468 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5781.9")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5782.0")] |