From ae4b6cc55b855661dea72615a187d1cdd9829e82 Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Wed, 29 Jun 2016 14:46:55 +0100
Subject: [PATCH] Cleaning of sync with updated branch

---
 conf/upstream_version | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/conf/upstream_version b/conf/upstream_version
index 97608a6..83da99b 100644
--- a/conf/upstream_version
+++ b/conf/upstream_version
@@ -1,5 +1 @@
-<<<<<<< HEAD
-4.4.11
-=======
 4.6.3
->>>>>>> cdf71f3fb6106bec9648b110eddceb6859a50902