diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-12 14:18:42 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-12 14:18:42 -0400 |
| commit | 65db32b1f878cd478e9f4b2b4c988890a7ca47c9 (patch) | |
| tree | 2c2da4acd36c6db1eba154904b701bb7dc7eb935 /SharedVersion.cs | |
| parent | 6dc8bf9aa133c99af12565b1206cd0c633838d84 (diff) | |
fix merge conflict
Diffstat (limited to 'SharedVersion.cs')
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 81877184d..1ef530ece 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.15.0")] +[assembly: AssemblyVersion("3.2.15.5")] |