Merge pull request #151 from siggines/fix

File maintenance

src/cacio-e-pepe.md

@@ -2,21 +2,13 @@
 
 ![pepe](pix/cacio-e-pepe.webp)
 
-<<<<<<< HEAD
 Cacio e Pepe (meaning cheese and pepper) is not only based but also incredibly simple, ideal for lazy neets and similarly minded people who don't want to wash too many dishes and don't like complicated recipes with too many extra ingredients.
-=======
-Cacio e Pepe (meaning cheese and pepper) is not only based but also incredibly simple, ideal for lazy neets and similarly minded people
-who don't want to wash too many dishes and don't like complicated recipes with too many extra ingredients.
->>>>>>> 13ce3f197272544f07f2a74c6b29d6a1c280d703
 
 ## Ingredients
 
 - Spaghetti (recipe works with pretty much any type)
-<<<<<<< HEAD
 - Grated Parmasean Cheese (or something similar, pic above uses parmasean and fresh mozzarella)
-=======
 - Grated Parmesan Cheese (or something similar)
->>>>>>> 13ce3f197272544f07f2a74c6b29d6a1c280d703
 
 ## Directions
 
@@ -33,4 +25,4 @@ Pasta water and the cheese are already salty, so you may not need to add any ext
 ## Contributors
 
 - Some guy called [siedes](https://github.com/siedes)
-- Batu Cam -- Added picture -- XMR: 85eZ4uVd4gkiCsQEeDnsQG9pUbDzdi1r1VSJ9hK5Sx7hKsFZjvmqtWV7gU1ysWUR32jhWutBRGUUq8VAJNUfin9wBCCuTdg
+- Batu Cam -- Added picture -- XMR: 85eZ4uVd4gkiCsQEeDnsQG9pUbDzdi1r1VSJ9hK5Sx7hKsFZjvmqtWV7gU1ysWUR32jhWutBRGUUq8VAJNUfin9wBCCuTdg

src/fried-anglerfish-fillet.md

@@ -15,11 +15,7 @@ This is a simple light-flavoured recipe. Anglerfish (I'm referring specifically
 
 ### Preparing the fish
 
-<<<<<<< HEAD
 1. Turn the creature on its back. With a sharp and preferrably short-bladed knife make an incision from the anus to just between the two small fins under the head. This is best done by inserting the knife blade tip facing up while putting force upwards and moving towards the head, letting gravity do the work. This helps to avoid puncturing the organs.
-=======
-1. Turn the creature on its back. With a sharp and preferably short-bladed knife make an incision from the anus to just between the two small fins under the head. This is best done by inserting the knife blade tip facing up while putting force upwards and moving towards the head, letting gravity do the work. This helps to avoid puncturing the organs.
->>>>>>> 13ce3f197272544f07f2a74c6b29d6a1c280d703
 2. Remove the organs. Gently pull and cut the membrane that connects each to the rest of the body.
 3. Make an incision around the mouth (the hard 'lips'), turn the fish around and do the same to that side.
 4. Start to slowly but firmly pull back the skin cutting whenever there is resistance as you make your way towards the tail.