Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TRUEorFALSE #54

Closed
wants to merge 3 commits into from
Closed

TRUEorFALSE #54

wants to merge 3 commits into from

Conversation

vstrshn13
Copy link
Collaborator

No description provided.

Copy link
Collaborator

@iceniveth iceniveth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please resolve those merge conflicts 🙏

@@ -19,6 +19,7 @@
"@types/node": "^20.1.2",
"flowbite": "^1.6.5",
"flowbite-react": "^0.4.3",
"ilearning": "github:Stacktrek-Training/stack-ilearning",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure what's the purpose of this? doesn't seem to be used in the app?

@@ -16,7 +16,11 @@ import DragGame from "./pages/rene/Drag";
import APIQuiz from "./pages/uly/QuizTrek/APIquiz";
import DragQuiz from "./pages/Nico/quizGame";
import ColorCodeExercise from "./pages/uly/ColorCode/App";
<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a merge conflict, there should not be this kind of line <<<<<<<<<<<<<< and >>>>>>>>>>>>>>>>>.

@vstrshn13 vstrshn13 closed this Jul 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants