diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-10-28 23:53:54 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-10-28 23:53:54 -0400 |
| commit | 5302cd5b20e8c160d288886732b410124091878f (patch) | |
| tree | 772e3f9d7f3fe55b1faf284ef2e33c966baaf242 | |
| parent | 85370b847a81dc60df50dbc692af79d1d73a74e4 (diff) | |
resolve merge conflict
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index f7bc6e9c7..1a5c5dde2 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.34.0")] +[assembly: AssemblyVersion("3.2.34.2")] |