diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-27 15:47:12 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-27 15:47:12 -0400 |
| commit | 9d762c3878fe80287a15159f2002947fc5e3c5be (patch) | |
| tree | 2e19be78c35d34fa7a2c651381c96c5cb69bdeb2 /SharedVersion.cs | |
| parent | 54886db5e53bd1f1553280322b1634dacc48820f (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 681982e49..3a703bb6f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6200")] +[assembly: AssemblyVersion("3.1.126")] |