diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-14 23:17:10 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-14 23:17:10 -0500 |
| commit | 82f4518c553edf2d7319f3138badaaf2235ed582 (patch) | |
| tree | a23bbedc35e6ff88c511fa174e86ca12056547c6 /SharedVersion.cs | |
| parent | ddd8a80654b9d4e7b6f42cae3f98cd4f5aef814a (diff) | |
fix merge conflict
Diffstat (limited to 'SharedVersion.cs')
| -rw-r--r-- | SharedVersion.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 20c5d4a10..baa57b21f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5877")] +[assembly: AssemblyVersion("3.0.*")] +//[assembly: AssemblyVersion("3.0.5867")] |