Update README

Author: martin-martin

tinydb/README.md

@@ -1,40 +1,15 @@
-# TinyDB Tutorial Code (Real Python)
+# TinyDB: A Lightweight JSON Database for Small Projects
 
-This repository contains the downloadable code for the Real Python tutorial: [TinyDB: A Lightweight JSON Database for Small Projects](https://realpython.com/tinydb-python/)
+This repository contains the downloadable code for the Real Python tutorial: [TinyDB: A Lightweight JSON
+Database for Small Projects](https://realpython.com/tinydb-python/)
 
 ## Contents
 
-<<<<<<< HEAD
-
-
-create\_db.py            - SCRIPT file containing code from the CREATE section of the tutorial.
-
-read.py               	- REPL code file containing code from the READ section of the tutorial.
-
-update\_db.py 		- SCRIPT file containing code from the UPDATE section of the tutorial.
-
-update\_db\_v2.py 	- SCRIPT file containing code from the UPDATE section of the tutorial.
-
-update\_db\_v3.py 	- SCRIPT file containing code from the UPDATE section of the tutorial.
-
-delete.py 		- REPL code file containing code from the DELETE section of the tutorial.
-
-
-
-countries\_file.csv 	- File containing csv data to be converted to TinyDB documents.
-
-ten\_countries.json 	- File containing an existing JSON object representing ten TinyDB records in a countries table.
-
-
-
-README.md		- This file
-
-=======
-- `create.py` — All code from the **CREATE** section of the tutorial
-- `read.py` — All code from the **READ** section of the tutorial
-- `update.py` — All code from the **UPDATE** section of the tutorial
-- `delete.py` — All code from the **DELETE** section of the tutorial
+- `create_db.py` — Code from the **CREATE** section of the tutorial
+- `read.py` — Code from the **READ** section of the tutorial
+- `update_db.py` — Code from the **UPDATE** section of the tutorial
+- `update_db_v2.py` — Additional update code from the **UPDATE** section
+- `update_db_v3.py` — Additional update code from the **UPDATE** section
+- `delete.py` — Code from the **DELETE** section of the tutorial
 - `countries_file.csv` — CSV data used to create TinyDB documents
 - `ten_countries.json` — Sample JSON file containing data for ten countries
-- `README.md` — This file
->>>>>>> df2997f1b3bd2e296717c85dfa9ec8a08aaa2087