diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-16 15:20:48 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-16 15:20:48 -0500 |
| commit | b42317c0c4aa6a12b93cdbd33ad47b4ceb520ee3 (patch) | |
| tree | 91d686f11804c949870760f2b210ebf415cc5257 /SharedVersion.cs | |
| parent | b9ce0a32234f2f6c1902e294b1f1f81fd7f79273 (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 033efbbd7..dd370f98d 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5871")] +[assembly: AssemblyVersion("3.0.5880")] |