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.

Sign up for GitHub

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

Jump to bottom

Fixing merge issues with website and backend #306

Merged
merged 1 commit into from
Jan 3, 2023
Merged

Fixing merge issues with website and backend #306

merged 1 commit into from
Jan 3, 2023

Conversation

fozziethebeat
Copy link
Collaborator

This:

  • Drops links that don't go to any pages yet
  • Drops an unused variable
  • Ensures that frontend-dev docker config runs redis

@fozziethebeat fozziethebeat self-assigned this Jan 3, 2023
@fozziethebeat fozziethebeat added this to the Minimum Viable Prototype milestone Jan 3, 2023
k-nearest-neighbor
k-nearest-neighbor approved these changes Jan 3, 2023
View reviewed changes
Copy link
Collaborator

@k-nearest-neighbor k-nearest-neighbor left a comment

Choose a reason for hiding this comment

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

✅ Server builds. Verified redis is running. Changes look good.

yk
yk approved these changes Jan 3, 2023
View reviewed changes
Copy link
Collaborator

@yk yk left a comment

Choose a reason for hiding this comment

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

lgtm, thank you!

@yk yk merged commit 9ae593f into main Jan 3, 2023
@yk yk deleted the 156-resolve-merge-issues branch January 3, 2023 09:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yk yk yk approved these changes

@AbdBarho AbdBarho AbdBarho approved these changes

@k-nearest-neighbor k-nearest-neighbor k-nearest-neighbor approved these changes

@andreaskoepf andreaskoepf Awaiting requested review from andreaskoepf andreaskoepf is a code owner

Assignees

@fozziethebeat fozziethebeat

Labels
backend website
Projects
None yet
Milestone
Minimum Viable Prototype
Development

Successfully merging this pull request may close these issues.
4 participants
@fozziethebeat @yk @AbdBarho @k-nearest-neighbor