diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-31 15:40:15 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-05-31 15:40:15 -0400 |
| commit | c37c9a75073b1b9caa3af2c3bc62abd837bd630e (patch) | |
| tree | 71f35f332d864574b697445f6750aa4e631220b9 /SharedVersion.cs | |
| parent | 7f0b4a5c346dbbf937b2a757e22ed239646c5d7b (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 04dff1c94..8211b2539 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.17.0")] +[assembly: AssemblyVersion("3.2.17.20")] |