search

githubteacher / octo-recipes

A place to render family recipes
http://githubteacher.github.io/octo-recipes/
3 stars 27 forks source link

Newnutella #28

Closed K05lowi closed 9 years ago

K05lowi commented 9 years ago

hej @githubteacher

please look at my suggestion for adding peanut butter

githubteacher commented 9 years ago

HI @K05lowi, unfortunately there are conflicts in this pull request.

I would suggest updating master and re-applying your changes if you want to send your PR again :smile:

If you want to know how to update and solve merges on your own, I'll be happy to explain that at another time.