From d172b4dbc2a8fbc5938bc5660032bd645511c0e5 Mon Sep 17 00:00:00 2001
From: Andrei <andreika-git@users.noreply.github.com>
Date: Fri, 2 Jun 2017 19:53:51 +0300
Subject: [PATCH] merge progress

---
 firmware/svnversion.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/firmware/svnversion.h b/firmware/svnversion.h
index e706b23d0f..00fa4062d7 100644
--- a/firmware/svnversion.h
+++ b/firmware/svnversion.h
@@ -1,5 +1,5 @@
 // This file was generated by Version2Header
-// Mon May 29 16:15:30 EDT 2017
+// Fri Jun 02 14:01:36 EEST 2017
 #ifndef VCS_VERSION
-#define VCS_VERSION "14243"
+#define VCS_VERSION "14274"
 #endif