From 3785298dd9a1d908dae133b9e1b4db977b7bc491 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 28 Aug 2016 12:26:37 -0400 Subject: restore version --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index baf48338e..3a703bb6f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.0.6300")] +[assembly: AssemblyVersion("3.1.126")] -- cgit v1.2.3 From 21a8dc77c322949339562526d6acbd02f9ece32f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 28 Aug 2016 15:45:17 -0400 Subject: fix merge conflict --- SharedVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 3a703bb6f..ded2038b0 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -//[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.126")] +[assembly: AssemblyVersion("3.1.*")] +//[assembly: AssemblyVersion("3.0.6060")] -- cgit v1.2.3 From 70234149eba173091a44b7383650de19c5558b9e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 28 Aug 2016 15:45:53 -0400 Subject: 3.1.127 --- SharedVersion.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index ded2038b0..52652dd3f 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.1.*")] -//[assembly: AssemblyVersion("3.0.6060")] +//[assembly: AssemblyVersion("3.1.*")] +[assembly: AssemblyVersion("3.1.127")] -- cgit v1.2.3 From 416e175901052af2b253d56519a2e44a78b3ce26 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 29 Aug 2016 14:44:19 -0400 Subject: 3.1.128 --- SharedVersion.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SharedVersion.cs') diff --git a/SharedVersion.cs b/SharedVersion.cs index 52652dd3f..19a055670 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.1.*")] -[assembly: AssemblyVersion("3.1.127")] +[assembly: AssemblyVersion("3.1.128")] -- cgit v1.2.3