diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-05-25 13:05:06 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-05-25 13:05:06 -0400 |
| commit | 4aebdad4f792611d8080824bf450e26a2e331546 (patch) | |
| tree | d3deb56cb93e044f3a6dc04bdd030002bea71a5d /SharedVersion.cs | |
| parent | 9120acca43076f567da65438ee952a103caee6cc (diff) | |
fix merge conflict
Diffstat (limited to 'SharedVersion.cs')
| -rw-r--r-- | SharedVersion.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index bfc6f44a7..278469226 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5989")] +[assembly: AssemblyVersion("3.1.*")] +//[assembly: AssemblyVersion("3.0.5960")] |