Merge remote-tracking branch 'refs/remotes/origin/main'

emmanueposu · May 17, 2024 · cb10a22 · cb10a22
2 parents 928f424 + a2b48ea
commit cb10a22
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/trivia-forge/frontend/src/Services/TF-db_services.jsx b/trivia-forge/frontend/src/Services/TF-db_services.jsx
@@ -5,6 +5,10 @@ import { Question } from '../Models/Question';
 import { Category } from '../Models/Category';
 import { Choice } from '../Models/Choice';
 
+<<<<<<<< < Temporary merge branch 1
+
+const API_URL = 'http://localhost:5000';
+=========
 const API_URL = 'http://127.0.0.1:5000';
 
 /* ************************************ User ************************************ */