Get involved urvi#93
Open
urvi-pisal wants to merge 4 commits into
Open
Conversation
DaveSauce
requested changes
Oct 12, 2018
DaveSauce
left a comment
DaveSauce
left a comment
Collaborator
There was a problem hiding this comment.
Thanks @urvi-pisal. volunteereventportal.php looks good. Unfortunately, some merge conflicts got committed to firstfuel and studenteventportal, which are causing problems. Also, press.php got deleted.
DaveSauce
requested changes
Oct 18, 2018
DaveSauce
left a comment
DaveSauce
left a comment
Collaborator
There was a problem hiding this comment.
Thanks for putting the press page back in, @urvi-pisal. The volunteer portal also looks good. You have some merge conflict errors that need to be removed in studenteventportal.php and firstfuel.php. Any <<<<<<< HEAD, ======, or >>>>>> ... need to be removed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.