diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-21 15:24:20 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-21 15:24:20 -0500 |
| commit | f54ed748376184b3d5f4100ad8c64cef732c226a (patch) | |
| tree | dc4ae0a81a8d75f8315452eb22f41fb06fa55a3d /SharedVersion.cs | |
| parent | 70f48f9cea0252e95e49ee6697fa73926bf9e2e1 (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 cde531792..aa4bd7a34 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.0")] +[assembly: AssemblyVersion("3.1.260")] |