This repository has been archived by the owner on Feb 16, 2023. It is now read-only.
Develop fix #3
Merged
Develop fix #3
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
comment out till transparency/confidence blog/page ready.
Corrected type on "interest"
Updated office address and added line break
updated content
Not sure if I'm liking this increment up now that I see it in progress... wondering if we shouldn't load current, then increment every n seconds... At a minimum we need to style it better (i.e., commas).
|
after talking with @mavrikjc I want to clarify that the description on this is incorrect. The revert actually does only change the files that were in conflict. In the end this was resolved with rebasing https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
undoes revert from ; 0343add
Co-authored by: Joseph Chiocchi yolk@arturo.ai