diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-27 15:31:19 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-07-27 15:31:19 -0400 |
| commit | b3db8fdb0d718a7e4378bb901fbfb7329b8124af (patch) | |
| tree | 9d7f867d79616230aa4de229d0ba7ba7f6432f26 /SharedVersion.cs | |
| parent | 677709f420b5f62046ba1aecb47418735596c07e (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 651eaf438..3b18c027e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6000")] +[assembly: AssemblyVersion("3.1.80")] |