This repository has been archived by the owner on May 11, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
Fix (contacts page style, extra js contacts.js, view token word in generate token page) #37
Merged
Merged
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
08b3c3a
fix https://github.com/pondersource/oc-sciencemesh/issues/36
parhamin2010 5d4a580
fix https://github.com/pondersource/oc-sciencemesh/issues/36
parhamin2010 2324364
fix https://github.com/pondersource/oc-sciencemesh/issues/36
parhamin2010 b58f17f
Merge branch 'main' into frontend
parhamin2010 854e50d
Merge branch 'main' into frontend
parhamin2010 1026531
fix https://github.com/pondersource/oc-sciencemesh/pull/37
parhamin2010 de7c81f
undo indent
michielbdejong 546f81f
profile-item-img unused
michielbdejong 0ea2996
bring back semicolon
michielbdejong 34b9b77
Minimize diff
michielbdejong File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you adding this here? What does it do?
I think this is code from accept.js that accidentally ended up in contacts.js
I removed it in https://github.com/pondersource/oc-sciencemesh/pull/35/files#diff-865e798ad64e5c4f552f82b73ce546ec3f2150da625ad60bb83db07c0e2d03ccL60-L68
But now you're adding it back, so that looks like you incorrectly resolved the merge conflict, probably?