diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-18 12:30:07 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-18 12:30:07 -0500 |
| commit | 304a04fc5e77d1738e9de26d1ff0d2919b024fb4 (patch) | |
| tree | bb9a16980f223e66a41c3ac0c7a39d6e64641217 | |
| parent | e2041c049b39e1b4bcc5b4c91e92495f94b4f56b (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 2ef3f5262..b25077032 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5781.6")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5781.7")] |