diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-06 16:20:07 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-06 16:20:07 -0400 |
| commit | 3e29d73d0c77c682e161c413703d5e36a8466885 (patch) | |
| tree | fce0c211243a79bafa5f3fd29fb238832ed491d5 | |
| parent | 423045dd56cb386c1f0f9549b7d87a7c7fe9c896 (diff) | |
fix merge conflict
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index e0fda273a..0cf34eeac 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.13")] +[assembly: AssemblyVersion("3.2.13.14")] |