diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-29 21:55:57 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-29 21:55:57 -0500 |
| commit | dbeea014aa57401b05779b47a7f28c0ec2193aa8 (patch) | |
| tree | 80693f9bd84a5b7f27de6c5b307f69d6d2e64155 | |
| parent | ee06dfbc50e89a91b2a132179dfbcb1d0bd0662a (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 a59146718..d7f33c7d6 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5800.1")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5800.2")] |