diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-14 09:41:56 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-14 09:41:56 -0500 |
| commit | 4679f0aed6c57f725ec5fc441e9a20588f288b6d (patch) | |
| tree | e75ea2a48a22b6128ba6de9daa10e61c354ad9f7 | |
| parent | ba1b7603eb4df42c429e660f08544c235155a659 (diff) | |
fix merge conflict
| -rw-r--r-- | SharedVersion.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 7c33af3a1..e1a4ca04b 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5781.4")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5781.5")] |