diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-12 15:40:19 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-12 15:40:19 -0400 |
| commit | 54cf4cbb4488056577d21be350b5b992962b294b (patch) | |
| tree | 504b905b9f2f4f26c12f99d25f6de0304286aea7 | |
| parent | 0fcceecaf69da3bd75d3d0e11f214a287bb77a8b (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 03f861f34..d08764e30 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.7300")] +[assembly: AssemblyVersion("3.1.187")] |