diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-22 13:59:14 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-22 13:59:14 -0400 |
| commit | 00b80a33c15eddb22ef7ede348309d8dc5034eca (patch) | |
| tree | b721ff1d58cc8cc25545133fefa95f956aab96a4 /SharedVersion.cs | |
| parent | aa66b9cf3d0f120d7926a3be198830f6d06d255e (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 c7790e6af..d996b5e97 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.72")] +[assembly: AssemblyVersion("3.1.*")] +//[assembly: AssemblyVersion("3.0.5986")] |