From e95a29b3081e1c01c617b89a67194a4de6df32e5 Mon Sep 17 00:00:00 2001
From: Ben Anderson <dataknut@icloud.com>
Date: Tue, 13 Jul 2021 11:56:25 +0100
Subject: [PATCH] fixed stray conflict indicator

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 2a42537..bb9c237 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ You link these using the relevant area level codes such as:
 ### rMappingExample
 
 A [simple example of mapping using R](rMappingExample.html). Examples use Local Authority (LA) and Middle-layer Super Output Area (MSOA) geography and electricity consumption data (provided in `data` subfolder).
->>>>>>> ea68ce4312db5b512e91afdd55cf1d412be2193f
 
 ### ONS-open-geography
 
-- 
GitLab