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

feature: added dining_room_table_interaction #181

Conversation

nishchalgv1
Copy link
Contributor

Added dining_room_table interaction inside src/interactions/map_campus_house_1/

Closes #130

Copy link

⚠️ MERGE CONFLICT DETECTED!

@nishchalgv1 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

Copy link

⚠️ MERGE CONFLICT DETECTED!

@nishchalgv1 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

1 similar comment
Copy link

⚠️ MERGE CONFLICT DETECTED!

@nishchalgv1 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

Copy link

⚠️ MERGE CONFLICT DETECTED!

@nishchalgv1 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

Copy link

⚠️ MERGE CONFLICT DETECTED!

@nishchalgv1 A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, check out these videos by Aldo: How To Get Started With Open Source and How To Resolve Git Merge Conflicts. If you get stuck ask over on Discord.

@nishchalgv1 nishchalgv1 deleted the feature/adding-interaction-map-house branch October 28, 2024 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add interactions to map_campus_house_1
1 participant