aboutsummaryrefslogtreecommitdiff
path: root/SharedVersion.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-13 16:20:51 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-08-13 16:20:51 -0400
commitf6ed934a7e32bf10c3a141773d713bf3b19e784f (patch)
tree35b6542c9dae4a664be982499edde0cf7d2a5692 /SharedVersion.cs
parent655cec52c41135d63905ec97f6c46d1b1831e434 (diff)
fix merge conflict
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 48adf8de4..09b55030f 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.26.0")]
+[assembly: AssemblyVersion("3.2.26.26")]