diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-09-09 15:41:49 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-09-09 15:41:49 -0400 |
| commit | ecc1ac78bb2e537e8dffd5af8258367fe7ee137a (patch) | |
| tree | e10a858643b25904130d3ba84415ac851cd267aa /SharedVersion.cs | |
| parent | 27df3ac19b664f26ac395ae0bdd6ea0d23361702 (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 450a356e7..740f3e7cc 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6400")] +[assembly: AssemblyVersion("3.1.143")] |