diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-17 16:59:20 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-17 16:59:20 -0400 |
| commit | 8b163221f700e717dfacbbde0ba110f098319857 (patch) | |
| tree | 3425d732bde3956c1b70a5945aef99e35019af66 /SharedVersion.cs | |
| parent | 6bbf0e8248b4c8a057336190f4c4eefab8a1cfaf (diff) | |
fix merge conflict
Diffstat (limited to 'SharedVersion.cs')
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index b9bd3b88e..cd7b4944e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5913")] +[assembly: AssemblyVersion("3.0.5939")] |