diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-07-01 12:23:46 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-07-01 12:23:46 -0400 |
| commit | fad71a6c7d12c8b207cdf473c7dd7daafa53c174 (patch) | |
| tree | 0e7246a268fa5a21f50775392d43164af42a84b9 | |
| parent | 91a7b7036e6f10e6be4cbe6fe2d753c51ba5e63f (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 99521d8d0..686b4c737 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.20.0")] +[assembly: AssemblyVersion("3.2.20.18")] |