diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-13 17:19:38 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-13 17:19:38 -0400 |
| commit | 94ddbfd57f63cc484d232894bea1e2f183eaaf7e (patch) | |
| tree | adef83be70151281aa7b157504ada7f440fc8d8c /SharedVersion.cs | |
| parent | 3f7f33bd5175c644014116891f685dfce542a7e0 (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 3dfdefd2d..013a0a589 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.8000")] +[assembly: AssemblyVersion("3.1.188")] |