search

malnvenshorn / OctoPrint-CostEstimation

OctoPrint plugin to display the estimated print cost for the loaded model
GNU Affero General Public License v3.0
23 stars 19 forks source link

Fix currency symbol #19

Closed etherwrangler closed 5 years ago

etherwrangler commented 5 years ago

What I did to fix #16 on my local copy.

I think I've finally got the branch set correctly. Let me know if its not.

malnvenshorn commented 5 years ago

No it doesn't look so. All the Merge branch 'develop' commits are from the master branch.

Here is what you need to do:

  1. Fork the repo
  2. git clone
  3. git checkout develop
  4. git branch
  5. git checkout
  6. add and commit your changes
  7. create your pull request
malnvenshorn commented 5 years ago

You also haven't fixed your code.

etherwrangler commented 5 years ago

Before I resubmit the pull request, does this appear correct?

git show-branch
! [develop] Merge branch 'develop'
 * [fix-currency-symbol] fix currency symbol
  ! [master] Merge branch 'develop'
---
 *  [fix-currency-symbol] fix currency symbol
--- [develop] Merge branch 'develop'