From 0d0e4ad695f3657d7ca3eef1ed54fe8608a490a1 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 26 Jan 2017 15:40:00 -0500
Subject: [PATCH] fix merge conflict

---
 SharedVersion.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SharedVersion.cs b/SharedVersion.cs
index 81cccbf50f..a84946b898 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
 //[assembly: AssemblyVersion("3.1.*")]
-[assembly: AssemblyVersion("3.1.2")]
+[assembly: AssemblyVersion("3.1.286")]