diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-16 12:15:06 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-16 12:15:06 -0500 |
| commit | 12855121607918671aab70fabb0b42180c0fe02c (patch) | |
| tree | d724ad4db11b780f30fc517a089e621a28dccb08 | |
| parent | ea837903052339818336a3c677c0660cb3c15c33 (diff) | |
fix merge conflict
| -rw-r--r-- | SharedVersion.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs index 0eadfe2a8..638530ade 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5870")] +[assembly: AssemblyVersion("3.0.5879")] |