diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-03-08 02:24:17 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-03-08 02:24:17 -0500 |
| commit | 0ac0a09c806112ce82dcd23f43c7df9ff8b5531d (patch) | |
| tree | cb677d629777a8b1db99e4e2094e6ac068fb841c | |
| parent | 49fd5551ba63c375b1ecbc57751fa04aa7dcec2b (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 f0f5c27b2..80c22d9e3 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.5")] +[assembly: AssemblyVersion("3.2.6.1")] |