diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-16 00:10:14 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-08-16 00:10:14 -0400 |
| commit | 9a956f5e29ea6e880e53df34d3919fffb1b9d405 (patch) | |
| tree | 895ec85e74f0bb577a4ec08c034ce214888d25c5 /SharedVersion.cs | |
| parent | 053ea1a6baffbd3bd1c50ef88efea81ede54d03f (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 b85021de4..a81b44de7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.106")] +[assembly: AssemblyVersion("3.0.6060")] |