diff --git a/episodes/04-changes.md b/episodes/04-changes.md index de7b81828..9920166bb 100644 --- a/episodes/04-changes.md +++ b/episodes/04-changes.md @@ -205,9 +205,9 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lemon -- salt +* avocado +* lemon +* salt ## Instructions ``` @@ -252,9 +252,9 @@ index df0654a..315bf3a 100644 @@ -1,3 +1,6 @@ # Guacamole ## Ingredients -+- avocado -+- lemon -+- salt ++* avocado ++* lemon ++* salt ## Instructions ``` @@ -363,9 +363,9 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lime -- salt +* avocado +* lime +* salt ## Instructions ``` @@ -381,10 +381,10 @@ index 315bf3a..b36abfd 100644 @@ -1,6 +1,6 @@ # Guacamole ## Ingredients - - avocado --- lemon -+- lime - - salt + * avocado +-* lemon ++* lime + * salt ## Instructions ``` @@ -418,10 +418,10 @@ index 315bf3a..b36abfd 100644 @@ -1,6 +1,6 @@ # Guacamole ## Ingredients - - avocado --- lemon -+- lime - - salt + * avocado +-* lemon ++* lime + * salt ## Instructions ``` @@ -703,9 +703,9 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado (1.35) -- lime (0.64) -- salt (2) +* avocado (1.35) +* lime (0.64) +* salt (2) ``` ```bash @@ -715,9 +715,9 @@ $ cat groceries.md ```output # Market A -- avocado: 1.35 per unit. -- lime: 0.64 per unit -- salt: 2 per kg +* avocado: 1.35 per unit. +* lime: 0.64 per unit +* salt: 2 per kg ``` Now you can add both files to the staging area. We can do that in one line: diff --git a/episodes/05-history.md b/episodes/05-history.md index 0c7fef819..938b1dd7f 100644 --- a/episodes/05-history.md +++ b/episodes/05-history.md @@ -37,9 +37,9 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lime -- salt +* avocado +* lime +* salt ## Instructions An ill-considered change ``` @@ -56,8 +56,8 @@ index b36abfd..0848c8d 100644 --- a/guacamole.md +++ b/guacamole.md @@ -4,3 +4,4 @@ - - lime - - salt + * lime + * salt ## Instructions +An ill-considered change ``` @@ -87,9 +87,9 @@ index df0654a..b36abfd 100644 @@ -1,3 +1,6 @@ # Guacamole ## Ingredients -+- avocado -+- lime -+- salt ++* avocado ++* lime ++* salt ## Instructions ``` @@ -150,9 +150,9 @@ index df0654a..93a3e13 100644 @@ -1,3 +1,7 @@ # Guacamole ## Ingredients -+- avocado -+- lime -+- salt ++* avocado ++* lime ++* salt ## Instructions +An ill-considered change ``` @@ -173,9 +173,9 @@ index df0654a..93a3e13 100644 @@ -1,3 +1,7 @@ # Gucamole ## Ingredients -+- avocado -+- lime -+- salt ++* avocado ++* lime ++* salt ## Instructions +An ill-considered change ``` @@ -215,9 +215,9 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lime -- salt +* avocado +* lime +* salt ## Instructions ``` diff --git a/episodes/08-collab.md b/episodes/08-collab.md index b723c827d..18a0b942f 100644 --- a/episodes/08-collab.md +++ b/episodes/08-collab.md @@ -79,10 +79,10 @@ $ cat hummus.md ```output # Hummus ## Ingredients -- chickpeas -- lemon -- olive oil -- salt +* chickpeas +* lemon +* olive oil +* salt ``` ```bash diff --git a/episodes/09-conflict.md b/episodes/09-conflict.md index 7da313d1c..374c5d837 100644 --- a/episodes/09-conflict.md +++ b/episodes/09-conflict.md @@ -35,9 +35,9 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lime -- salt +* avocado +* lime +* salt ## Instructions ``` @@ -51,11 +51,11 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lime -- salt +* avocado +* lime +* salt ## Instructions -- put one avocado into a bowl. +* put one avocado into a bowl. ``` and then push the change to GitHub: @@ -98,11 +98,11 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lime -- salt +* avocado +* lime +* salt ## Instructions -- peel the avocados +* peel the avocados ``` We can commit the change locally: @@ -212,14 +212,14 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lime -- salt +* avocado +* lime +* salt ## Instructions <<<<<<< HEAD -- peel the avocados +* peel the avocados ======= -- put one avocado into a bowl. +* put one avocado into a bowl. >>>>>>> dabb4c8c450e8475aee9b14b4383acc99f42af1d ``` @@ -243,11 +243,11 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lime -- salt +* avocado +* lime +* salt ## Instructions -- peel the avocados and put them into a bowl. +* peel the avocados and put them into a bowl. ``` To finish merging, @@ -328,11 +328,11 @@ $ cat guacamole.md ```output # Guacamole ## Ingredients -- avocado -- lime -- salt +* avocado +* lime +* salt ## Instructions -- peel the avocados and put them into a bowl. +* peel the avocados and put them into a bowl. ``` We don't need to merge again because Git knows someone has already done that.