diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-28 15:45:17 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-28 15:45:17 -0400 |
| commit | 21a8dc77c322949339562526d6acbd02f9ece32f (patch) | |
| tree | e2995601a1b72fa708ee7cf6f9702dcfb26ce2f7 /SharedVersion.cs | |
| parent | 3785298dd9a1d908dae133b9e1b4db977b7bc491 (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 3a703bb6f..ded2038b0 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.126")] +[assembly: AssemblyVersion("3.1.*")] +//[assembly: AssemblyVersion("3.0.6060")] |