From 54db1db3560666ef690383a53e552fa6a4a57357 Mon Sep 17 00:00:00 2001
From: "Ware, Joseph (DLSLtd,RAL,LSCI)" <joseph.ware@diamond.ac.uk>
Date: Wed, 17 Apr 2024 14:47:25 +0100
Subject: [PATCH] Remove boilerplate and merge conflict marker

---
 README.md | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/README.md b/README.md
index 9b145c5e06..3eb3456249 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 [![CI](https://github.com/bluesky/ophyd-async/actions/workflows/ci.yml/badge.svg)](https://github.com/bluesky/ophyd-async/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/bluesky/ophyd-async/branch/main/graph/badge.svg)](https://codecov.io/gh/bluesky/ophyd-async)
-
 [![PyPI](https://img.shields.io/pypi/v/ophyd-async.svg)](https://pypi.org/project/ophyd-async)
 [![License](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
 
@@ -8,32 +7,12 @@
 
 Asynchronous Bluesky hardware abstraction code, compatible with control systems like EPICS and Tango
 
-This is where you should write a short paragraph that describes what your module does,
-how it does it, and why people should use it.
-
-<<<<<<< before updating
 |    Source     |     <https://github.com/bluesky/ophyd-async>      |
 | :-----------: | :-----------------------------------------------: |
 |     PyPI      |             `pip install ophyd-async`             |
 | Documentation |      <https://bluesky.github.io/ophyd-async>      |
 |   Releases    | <https://github.com/bluesky/ophyd-async/releases> |
 
-This is where you should put some images or code snippets that illustrate
-some relevant examples. If it is a library then you might put some
-introductory code here:
-
-```python
-from ophyd_async import __version__
-
-print(f"Hello ophyd_async {__version__}")
-```
-
-Or if it is a commandline tool then you might put some example commands here:
-
-```
-python -m ophyd_async --version
-```
-
 <!-- README only content. Anything below this line won't be included in index.md -->
 
 See https://bluesky.github.io/ophyd-async for more detailed documentation.