diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-02 17:50:58 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-02 17:50:58 -0400 |
| commit | db99a9840b63b645da01df5f173720ad071b2ce2 (patch) | |
| tree | 1e28a9bc4dc32719159ecbc94ab358e3f1351ef4 /SharedVersion.cs | |
| parent | 7a39ce558a5db3c140fe44b235a8fb682b3a72d3 (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 61ddc94df..73dead847 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.5981")] +[assembly: AssemblyVersion("3.1.54")] |