diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-03-25 13:51:54 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-03-25 13:51:54 -0400 |
| commit | 736e63241011cb9ae798bf4091cd37e097045c21 (patch) | |
| tree | fd6bfc298b1e6093cedc04386c986108b44c55ab /SharedVersion.cs | |
| parent | 4a7df961dce3c1af6815e6d618de50be5fd0a694 (diff) | |
fix merge conflict
Diffstat (limited to 'SharedVersion.cs')
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index e1c8f8995..5f6e1dde6 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5882")] +[assembly: AssemblyVersion("3.0.5920")] |