diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-09 19:38:12 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-09 19:38:12 -0500 |
| commit | 7fdd180b20fab8a49c89edf64f3bb529e517c5a9 (patch) | |
| tree | 8d110ae343c512ff2d8157a1462e4f3406ce552d /SharedVersion.cs | |
| parent | 345a619d934432f6f91aa716989d34abebaec117 (diff) | |
fix merge conflict
Diffstat (limited to 'SharedVersion.cs')
| -rw-r--r-- | SharedVersion.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index d1a774c2f..7a98bd22e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,3 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.2.0")] +[assembly: AssemblyVersion("3.2.1.100")] |