Skip to content
Snippets Groups Projects
Commit f79ab648 authored by Shawn Kauenhofen (sak330)'s avatar Shawn Kauenhofen (sak330)
Browse files

Merge branch 'main' into 'bob' 

# Conflicts:
#   App/event36/app/src/main/java/com/example/event36/Event.java
#   App/event36/app/src/main/java/com/example/event36/EventActivity.java
#   App/event36/app/src/main/java/com/example/event36/MainActivity.java
#   App/event36/app/src/main/java/com/example/event36/Restaurant.java
parents 349c5a39 d63b2c38
No related branches found
No related tags found
2 merge requests!35Edit event function, but can't pull the event acticity info back to main acticity,!34Reviews for events are done. The reviews for events and restaurents have been...
Hide whitespace changes
Inline Side-by-side
Showing
with 818 additions and 220 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment