diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-06 01:52:21 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-06 01:52:21 -0500 |
| commit | 730dd523c07a06105b8e0f597c782f1dd5d80a7e (patch) | |
| tree | 1d9e72ad5d7987f7e962cb66c0218614a713cff1 | |
| parent | 6f1a300bdef907415160728670726735067efc7a (diff) | |
fix merge conflict
| -rw-r--r-- | SharedVersion.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 05eb1febbe..b63f7d15e9 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,3 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.295")] +[assembly: AssemblyVersion("3.2.0.100")] |