From 706223c72c23e63b2b3f81e1c71fbea36d7ddb6b Mon Sep 17 00:00:00 2001
From: Pulkit Pareek <pulkitpareek18@gmail.com>
Date: Sun, 24 Dec 2023 22:21:49 +0530
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 95fe1e0..83878e0 100644
--- a/README.md
+++ b/README.md
@@ -44,13 +44,7 @@ Open the project directory and run `index.html`.
 - [Pace.js](https://codebyzach.github.io/pace/e.com/project/elangosundar/awesome-README-templates)
 - IMDB
 - TMDB
-<<<<<<< HEAD
 - Smashy Stream
-=======
-- [Smashy Stream](https://embed.smashystream.com)
-- [CORS-Proxy](https://corsproxy.io)
-
->>>>>>> 844bb8057f0425c91a06e3b6fb91944cb889d633
 
 ## Authors