Skip to content
This repository has been archived by the owner on Dec 3, 2021. It is now read-only.

Commit

Permalink
Add button to lesson17/stage3
Browse files Browse the repository at this point in the history
Signed-off-by: Matt Oswalt <[email protected]>
  • Loading branch information
Mierdin committed Mar 2, 2020
1 parent 6d57110 commit e31ba87
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions lessons/fundamentals/lesson-17-git/stage3/guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ Git is telling us that it still sees an unresolved state, so we need to run a ne
git add interface-config.txt
git commit -s -m "Resolve merge conflict, overwrite Fred's change"
```
<button type="button" class="btn btn-primary btn-sm" onclick="runSnippetInTab('linux1', this)">Run this snippet</button>

## The Final Merge

Expand Down

0 comments on commit e31ba87

Please sign in to comment.