diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-11-20 13:02:46 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-11-20 13:02:46 -0500 |
| commit | 7d15b140cfe4f761e03f661f82cf946f327863f5 (patch) | |
| tree | 5863d48e3e0f3fe224fbee2b6b59f7ab53169ed5 | |
| parent | 4c1834c087cbfb06cd3111571dbc4c73d4ff6a0e (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 404fa3e84..580bc7001 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.36.0")] +[assembly: AssemblyVersion("3.2.40.0")] |