From 300234a5c4d4df4a1e85f583bfa19078267d46f2 Mon Sep 17 00:00:00 2001
From: PolynomialDivision <vincent@systemli.org>
Date: Thu, 4 Jan 2018 23:42:59 +0100
Subject: [PATCH] fix merge

---
 src/storage/datastorage.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/storage/datastorage.c b/src/storage/datastorage.c
index 181a2e5..546c29c 100644
--- a/src/storage/datastorage.c
+++ b/src/storage/datastorage.c
@@ -221,7 +221,6 @@ int build_network_overview(struct blob_buf *b)
     }
     return 0;
 }
->>>>>>> master
 
 int eval_probe_metric(struct probe_entry_s probe_entry) {