diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-08 13:52:45 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-08 13:52:45 -0500 |
| commit | a38794210776ed428c5de1c5a6265d2e23efbcb2 (patch) | |
| tree | 0520c1a270713a3519df8ef47ac7149b2b4b265f /SharedVersion.cs | |
| parent | 534c2a0e687793fa7604dff2a5484f004a40948f (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 323710f1c..b4951f12d 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5802")] +[assembly: AssemblyVersion("3.0.5785.0")] |