Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osmomath(log/CL): ln(x), log_1.0001(x), log_custom(x) (backport #3169) #3197

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 1, 2022

This is an automatic backport of pull request #3169 done by Mergify.
Cherry-pick of 5c408f9 has failed:

On branch mergify/bp/v12.x/pr-3169
Your branch is up to date with 'origin/v12.x'.

You are currently cherry-picking commit 5c408f98.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   osmomath/decimal.go
	both modified:   osmomath/decimal_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* natural logarithm

* tick log

* save

* save

* customBase

* logs

Co-authored-by: Ruslan Akhtariev <[email protected]>
(cherry picked from commit 5c408f9)

# Conflicts:
#	osmomath/decimal.go
#	osmomath/decimal_test.go
@mergify mergify bot requested a review from a team November 1, 2022 01:23
@mergify mergify bot added the conflicts label Nov 1, 2022
@p0mvn
Copy link
Member

p0mvn commented Nov 1, 2022

too many conflicts

@p0mvn p0mvn closed this Nov 1, 2022
@mergify mergify bot deleted the mergify/bp/v12.x/pr-3169 branch November 1, 2022 01:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants