diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-30 23:41:41 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-30 23:41:41 -0400 |
| commit | 724aa4af40f7cf02efcdc6e8c847a0f8bcb5d7ff (patch) | |
| tree | 62a46de70aa0e611195f3f86819f501f0dad16de /SharedVersion.cs | |
| parent | 297cbb2610fc4aa9101cdd72996e5b78a38f2959 (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 2369b6a48..073260ad7 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5947")] +[assembly: AssemblyVersion("3.0.5934")] |