diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-20 15:27:27 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-10-20 15:27:27 -0400 |
| commit | 40255e6014d4db18c8683e942ba60d994cd723a7 (patch) | |
| tree | 8807901271ae234d2f6587c7bbd1b8593678b84d /SharedVersion.cs | |
| parent | b90b64aae8966b96cba874c012525401689c1a2f (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 8e1021c69..0558944c6 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.8200")] +[assembly: AssemblyVersion("3.1.196")] |