aboutsummaryrefslogtreecommitdiff
path: root/SharedVersion.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-07-23 02:11:54 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-07-23 02:11:54 -0400
commite99bc61d53f393dc475e265e3b5bc8c19b186594 (patch)
tree5a6728bea8ad6ccceada9e43e8df083d5670a067 /SharedVersion.cs
parent975a973d316ee47f7ebb47a2a9f5e94806546dcc (diff)
fix merge conflicts
Diffstat (limited to 'SharedVersion.cs')
-rw-r--r--SharedVersion.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/SharedVersion.cs b/SharedVersion.cs
index c1fcd083e..65368da5e 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.25.0")]
+[assembly: AssemblyVersion("3.2.25.12")]