From e775cf348df10bd03aed06535176a741b6aef8c6 Mon Sep 17 00:00:00 2001
From: alexandander <51231630+alexandander@users.noreply.github.com>
Date: Sun, 11 Oct 2020 17:12:04 -0700
Subject: [PATCH] forgot to save -_-

---
 readme.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index 6ee6778..80e7e43 100644
--- a/readme.md
+++ b/readme.md
@@ -232,19 +232,18 @@ Content about: MongoDB, SQL, C#, C++ \
 Featured playlists: `MongoDB - NoSQL Database`, `PHP - Programming Language`, `C# - Programming Language`, `C++ - Programming Language`. \
 <br/>
 
-<<<<<<< HEAD
 [<img align="left" height="94px" width="94px" alt="KodingKevin" src="https://yt3.ggpht.com/a/AATXAJymF9D2kCpzhV3feeWOuCw_xf2FzmYUCabaBrhj=s88-c-k-c0x00ffffff-no-rj"/>](https://www.youtube.com/channel/UCXpGqiSd3BD0FQ9OP3ziFsw)
 
 [**KodingKevin**](https://www.youtube.com/channel/UCXpGqiSd3BD0FQ9OP3ziFsw) \
 Content about: Data Structures, Algorithms, Coding Interview \
 Featured playlists: `Array Methods Mini Course`, `Javascript Algorithms + Data Structures`. \
-=======
+<br/>
+
 [<img align="left" height="94px" width="94px" alt="The Cherno Project's avatar" src="https://yt3.ggpht.com/a/AATXAJwnC9ATEyVr8Mf-Vz3K1hAUMzPXjxz_rp2LZL6JVg=s100-c-k-c0xffffffff-no-rj-mo"/>](https://www.youtube.com/user/TheChernoProject)
 
 [**The Cherno**](https://www.youtube.com/user/TheChernoProject) [<img height="16px" width="16px" alt="Badge for verified YouTube channels" src="media/badge-verified.svg" title="Is a verified YouTube channel"/>](badges.md#verified-youtube-channel) [<img height="16px" width="16px" alt="Badge for youtubers that upload videos weekly" src="media/badge-weekly.svg" title="Uploads videos weekly"/>](badges.md#weekly-video-upload) \
 Content about: C++ and game development \
 Featured playlists: `Game Engine`, `C++`, `OpenGL`, `3D game programming in java`. \
->>>>>>> upstream/main
 <br/>
 
 [🔼 Back to the top](#contents)