diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-01 14:21:22 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-02-01 14:21:22 -0500 |
| commit | f14e9b8d3af98f6ffbe243b105f96f46e8cf3b06 (patch) | |
| tree | 30acbc437cb4ae70119dca7e91a5600e012ad085 /SharedVersion.cs | |
| parent | c48a4cfb992d486cf55f8d687b6ff0559ae38783 (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 26718c700..a5c9547e0 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5818")] +[assembly: AssemblyVersion("3.0.5857")] |