From e03d18edf01c410079743bf1c816eaa8c436d9df Mon Sep 17 00:00:00 2001
From: Ollie Copping <oliver.copping@diamond.ac.uk>
Date: Mon, 15 Nov 2021 14:05:42 +0000
Subject: [PATCH] Fixed issue with previous merge conflict fix

---
 README.rst | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/README.rst b/README.rst
index df67a0c57..8f9b4fbb2 100644
--- a/README.rst
+++ b/README.rst
@@ -23,18 +23,6 @@ a **TCPServer**:
 
     @dataclass
     class RandomTrampoline(ComponentConfig):
-<<<<<<< HEAD
-=======
-
-        def __call__(self) -> Component:  # noqa: D102
-            return DeviceSimulation(
-                name=self.name,
-                device=RandomTrampolineDevice(),
-                adapters=[RemoteControlledAdapter(server=TcpServer(format="%b\r\n"))])
-
-
-    class RandomTrampolineDevice(Device):
->>>>>>> origin/master
 
         def __call__(self) -> Component:  # noqa: D102
             return DeviceSimulation(