diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-06 12:21:01 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-06 12:21:01 -0500 |
| commit | 3a1d2ef5d07c6c4bb4cee7232731cf28908c061e (patch) | |
| tree | 80376cfb09c6141fe63f267ab22d402eb26d1687 | |
| parent | 59a9bc28812f5b1647b96b6cf1b6d1ad5587bd7a (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 86d94852a..323710f1c 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5784.0")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5802")] |