diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-01 22:32:53 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-01 22:32:53 -0500 |
| commit | 93817bdb7bc8ffcdb854b3e5d47ac63228f881c1 (patch) | |
| tree | 581370edfc875951811ba688c2daede6a0a2066c | |
| parent | 43377ec1e2fdc87d4d8b05dc567e16600d4d41b2 (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 f39b5a5d1e..83969cb188 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5781.3")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5781.4")] |