diff options
| author | Kyle Clemens <jkc.clemens@gmail.com> | 2013-11-10 02:50:42 -0500 |
|---|---|---|
| committer | Kyle Clemens <jkc.clemens@gmail.com> | 2013-11-10 02:50:42 -0500 |
| commit | c760dfd114949aabd277c8a7e09d80379737d350 (patch) | |
| tree | 7498f95113b0d0209933d20ff4d6b4b62b09aa38 | |
| parent | ada908688c54866c6cb4645b83b7dab558dc2122 (diff) | |
| parent | 05be34d4d3a2d4323ded729929abc50ea6c13b82 (diff) | |
Merge branch 'master' of git://github.com/np98765/Potato into np98765-master
Conflicts:
README.md
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,7 +7,7 @@ If you fork this then you can say you forked a potato. Forking potatoes is an ancient and well-manered tradition. -The potato first appeared in Peru about ten thousand years ago. The potato was an early food source, and likely a highly traded good in early South America. Having been traded for several thousand years, and enduring much artifical selection, the explorers of the sixteenth and seventeenth century brought the potato back to Europe, where the crop grew. Originally thought to be poisenous and evil, the crop didn't become a major food for another hundred years. +The potato first appeared in Peru about ten thousand years ago. The potato was an early food source, and likely a highly traded good in early South America. Having been traded for several thousand years, and enduring much artifical selection, the explorers of the sixteenth and seventeenth century brought the potato back to Europe, where the crop grew. Originally thought to be poisonous and evil, the crop didn't become a major food for another hundred years. By the time potatoes were introduced into Europe, the fork was already prevelant. Hence, started the tradition of forking the potato. |