Resolved merge conflicts of PR #97 #102
Open
Conversation
This file contains 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
jashandeep31
changed the title
jashandeep31
force-pushed
the
feature/new-ui/user-pages
branch
from
ff31427
to
2e415e2
Compare
jashandeep31
changed the title
|
@devsargam make sure this gets merged before anything else since this one will have a lot of conflicts if you m erge something else |
|
sure @hkirat |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Thanks to @Smnthjm08 All work is of him
I just resolved his conflicts
original at #97
temp Url : http://139.59.63.75:3000
admin login
pass: [email protected]
pass: QSuu!&gylY!GVBzm
Submission part is down as I forget to add cloudnariy env in the .env
Its just hosting issue
preview of changes https://intelligent-hell-598.notion.site/UI-screenshots-b4485851452d4a91ac2a0ac0f880b8af