diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 22:44:52 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 22:44:52 -0500 |
| commit | 7dca92f8a0ca2773a6b86cb2662567d1d49f448e (patch) | |
| tree | c737025596af2e689abb2429d209c4a8eee8ecfa /SharedVersion.cs | |
| parent | b46ef16ba838dafbd79f6e9ffbea37afa2104b0b (diff) | |
fix merge conflicts
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 d37096748..9a061068e 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5800.0")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5800.1")] |