differences for PR #994

swcarpentry · Jul 2, 2024 · ee7be68 · ee7be68
1 parent 8fe5116
commit ee7be68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/09-conflict.md b/09-conflict.md
@@ -502,24 +502,24 @@ started.
 | order | action . . . . . . . . . . | command . . . . . . . . . .                   | 
 | ----- | -------------------------- | --------------------------------------------- |
 | 1     |                            |                                               | 
-| 2     |                            | `echo 100 >> numbers.txt`                                              | 
+| 2     |                            | `echo 100 >> numbers.txt`                     | 
 | 3     |                            |                                               | 
 | 4     |                            |                                               | 
 | 5     |                            |                                               | 
-| 6     | Celebrate!                 | `AFK`                                              | 
+| 6     | Celebrate!                 |                                               | 
 
 :::::::::::::::  solution
 
 ## Solution
 
 | order | action . . . . . .         | command . . . . . . . . . . . . . . . . . . . | 
 | ----- | -------------------------- | --------------------------------------------- |
-| 1     | Update local               | `git pull origin main`                                              | 
-| 2     | Make changes               | `echo 100 >> numbers.txt`                                              | 
-| 3     | Stage changes              | `git add numbers.txt`                                              | 
-| 4     | Commit changes             | `git commit -m "Add 100 to numbers.txt"`                                              | 
-| 5     | Update remote              | `git push origin main`                                              | 
-| 6     | Celebrate!                 | `AFK`                                              | 
+| 1     | Update local               | `git pull origin main`                        | 
+| 2     | Make changes               | `echo 100 >> numbers.txt`                     | 
+| 3     | Stage changes              | `git add numbers.txt`                         | 
+| 4     | Commit changes             | `git commit -m "Add 100 to numbers.txt"`      | 
+| 5     | Update remote              | `git push origin main`                        | 
+| 6     | Celebrate!                 |                                               | 
 
 :::::::::::::::::::::::::
 

diff --git a/md5sum.txt b/md5sum.txt
@@ -11,7 +11,7 @@
 "episodes/06-ignore.md" "0683eb66e0a84b5297827704a1010c7b" "site/built/06-ignore.md" "2023-09-18"
 "episodes/07-github.md" "7a9bdeb91c3b2fcc331b8f2f457c7beb" "site/built/07-github.md" "2024-06-20"
 "episodes/08-collab.md" "1467e4993e8854f39db4ce9376813355" "site/built/08-collab.md" "2024-06-20"
-"episodes/09-conflict.md" "5031a6d36d7e8b6863287bcd335204c6" "site/built/09-conflict.md" "2024-06-20"
+"episodes/09-conflict.md" "7030a6e8728e09fad34ce0485beff273" "site/built/09-conflict.md" "2024-07-02"
 "episodes/10-open.md" "6504a09be66b6c32dc3bc929da9ae50e" "site/built/10-open.md" "2023-05-30"
 "episodes/11-licensing.md" "760c89ee6411c89378229180997a4388" "site/built/11-licensing.md" "2023-05-08"
 "episodes/12-citation.md" "237b24e4a72f38a36b9d31701f8450f7" "site/built/12-citation.md" "2024-03-27"