diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-01-26 15:40:00 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-01-26 15:40:00 -0500 |
| commit | 0d0e4ad695f3657d7ca3eef1ed54fe8608a490a1 (patch) | |
| tree | 0c37e3590e22034812a92d3587507109540468c7 /SharedVersion.cs | |
| parent | 44d41ad74c4a910b1839c111e2afc7321df0c91c (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 81cccbf50..a84946b89 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.2")] +[assembly: AssemblyVersion("3.1.286")] |