diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-03-31 12:44:02 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-03-31 12:44:02 -0400 |
| commit | 0be3fdc062ab218ba5702f065b4bee565850c402 (patch) | |
| tree | 678cc1d27a472bb1ef8d9c4bc8f023462c438ee8 | |
| parent | 96f6985b4b5eee8fbb926989b1cf22076c9d6861 (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 e0c8719c1..2d2a44ae5 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5921")] +[assembly: AssemblyVersion("3.0.*")] +//[assembly: AssemblyVersion("3.0.5911")] |