From 5ee2424d62b4b7f606ea1afc8ed74220561a64c2 Mon Sep 17 00:00:00 2001 From: Eric Hellman Date: Wed, 9 Oct 2024 18:34:37 -0400 Subject: [PATCH] remove conflict artifact (#11458) --- courses/free-courses-en.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/courses/free-courses-en.md b/courses/free-courses-en.md index 2e8b64319..f426909d3 100644 --- a/courses/free-courses-en.md +++ b/courses/free-courses-en.md @@ -566,7 +566,7 @@ * [Database Systems](http://ocw.mit.edu/courses/electrical-engineering-and-computer-science/6-830-database-systems-fall-2010/) (MIT's opencourseware) * [Database Systems - Cornell University Course (SQL, NoSQL, Large-Scale Data Analysis)](https://www.youtube.com/watch?v=4cWkVbC2bNE) - Professor Immanuel Trummer, freeCodeCamp.org * [DBMS for GATE Exams](https://www.youtube.com/playlist?list=PLWPirh4EWFpGrpcMfZ6UcdI786QdtSxV8) - Tutorialspoint -* [DBMS Placement Series](https://www.youtube.com/playlist?list=PLDzeHZWIZsTpukecmA2p5rhHM14bl2dHU) - CodeHelp by Babbar>>>>>>> main +* [DBMS Placement Series](https://www.youtube.com/playlist?list=PLDzeHZWIZsTpukecmA2p5rhHM14bl2dHU) - CodeHelp by Babbar * [DML Server Administration](https://alison.com/course/databases-dml-statements-and-sql-server-administration-revised) (Alison) * [Introduction to Databases](https://lagunita.stanford.edu/courses/Engineering/db/2014_1/about) (Stanford University) * [Learn SQL Basic for Data Science Specialisation](https://www.coursera.org/specializations/learn-sql-basics-data-science#about) (Coursera)