resolved slight merge conflict
This commit is contained in:
commit
5399154a5e
1 changed files with 2 additions and 0 deletions
|
@ -97,6 +97,8 @@ Let's start with the basics.
|
|||
-------------------------------------------------------------------------
|
||||
LIVE DEMONSTRATION TIME
|
||||
-------------------------------------------------------------------------
|
||||
GET OUT YOUR LAPTOP
|
||||
-------------------------------------------------------------------------
|
||||
# DO NOT DO THIS
|
||||
![BAD](3_git/bad_message.png)
|
||||
-------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue