diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-05 02:13:19 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-05 02:13:19 -0400 |
| commit | 8cca5dfb03d126b87b007e4699b061433991d3ae (patch) | |
| tree | ac3ffae447a878d314ab87b1ff0cc757100bd314 /SharedVersion.cs | |
| parent | 295d47a4878f6981125e12dd6e15d1472b73a476 (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 d852537b2..8de20ebed 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.89")] +[assembly: AssemblyVersion("3.1.*")] +//[assembly: AssemblyVersion("3.1.80")] |