[UPDATE] Readme.md conflict resolved

tathagata-raha · tathagata-raha · commit 0971af27b7c4 · 2022-08-18T18:15:13.000+05:30
diff --git a/README.md b/README.md
@@ -102,3 +102,4 @@ The API documentation for our application is neatly documented using Swagger UI
 - **Deployment**: <img src="https://img.shields.io/badge/docker%20-%230db7ed.svg?&style=for-the-badge&logo=docker&logoColor=white"/> 
 
 Made with ❤️️ as part of Data Foundation Systems course, Spring 2022, IIIT Hyderabad.
+

Original file line number	Diff line number	Diff line change
`@@ -102,3 +102,4 @@ The API documentation for our application is neatly documented using Swagger UI`
`102`	`102`	`- Deployment: <img src="https://img.shields.io/badge/docker%20-%230db7ed.svg?&style=for-the-badge&logo=docker&logoColor=white"/>`
`103`	`103`
`104`	`104`	`Made with ❤️️ as part of Data Foundation Systems course, Spring 2022, IIIT Hyderabad.`
	`105`	`+`