diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 16:43:31 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-27 16:43:31 -0500 |
| commit | 88153d3875532c2fe648d92b36c7b4aa353b56e4 (patch) | |
| tree | 3abca310d7bd4b004405d12503aaef9d3d2f3cd4 | |
| parent | 03118de6b7ef7d0269f030621351aeac5d29d5b1 (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 6b204d246..3dc58d93f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5782.0")] +[assembly: AssemblyVersion("3.0.5800.0")] |