diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-16 15:25:16 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-16 15:25:16 -0400 |
| commit | 007f4e193af99036b250a8323f92b753a9b74797 (patch) | |
| tree | d3aa39cb56a756a74d103baf3108d4d73493f5cf /SharedVersion.cs | |
| parent | 670a388f61dac5cd72db0c2d4129623a4e1a804d (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..a40d0d15b 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.5938")] |