diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-14 16:55:21 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-14 16:55:21 -0500 |
| commit | 5c03b0d769b230883218e1526441bd7fd0cf7cbc (patch) | |
| tree | 62c8f8c770a4d05e71fbca50cce4a0138d120335 /SharedVersion.cs | |
| parent | 93ae4aab76729b92cc1eb63a75ea1536a005419d (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 ef63ab483..f0c26f457 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5781.5")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5781.6")] |