Fixed issue with previous merge conflict fix

DiamondLightSource · Nov 15, 2021 · e03d18e · e03d18e
1 parent cb7a2fb
commit e03d18e
Showing 1 changed file with 0 additions and 12 deletions.
diff --git 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(