diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-21 12:50:05 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-21 12:50:05 -0500 |
| commit | 7dffc197da7fd95eaec750f7a398c18fa2291dc7 (patch) | |
| tree | 020b9fe67b93bb2697dd323289ee235136723f0b /SharedVersion.cs | |
| parent | e290f247180d40b5080a5fe15935b4ea788453af (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 3687921c4..febada7af 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5781.7")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5781.9")] |