diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-23 16:12:52 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-23 16:12:52 -0400 |
| commit | d661f690f58cd05be86843d2c7c8a2984c66c2f6 (patch) | |
| tree | 1eb3a9885782512ddf29e215dd69981699c2edeb /SharedVersion.cs | |
| parent | 352ff3b212c435e6b407df2f985fd9f3ef39215c (diff) | |
fix merge conflicts
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 108a16bf4..17087a098 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5991")] +[assembly: AssemblyVersion("3.1.75")] |