Skip to content

Commit 3de54e9

Browse files
committed
Remove social image and step emoji
1 parent 35612c4 commit 3de54e9

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

README.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
Add your open source license, GitHub uses Creative Commons Attribution 4.0 International.
66
-->
77

8-
<img src=https://user-images.githubusercontent.com/1221423/156947036-03513bb1-3dd4-412d-b89a-605b3170b73a.svg width=300 align=right>
9-
108
# Resolve merge conflicts
119

1210
_Merge conflicts are a normal part of working in Git. Learn why they happen and how to resolve them with ease._
@@ -21,7 +19,7 @@ _Merge conflicts are a normal part of working in Git. Learn why they happen and
2119
-->
2220

2321
<details id=0 open>
24-
<summary><h2>:golf: Start</h2></summary>
22+
<summary><h2>Start</h2></summary>
2523

2624
[![start-course](https://user-images.githubusercontent.com/1221423/154366775-5491926f-9ed1-4a4a-a229-0810c0ed7e5e.svg)](https://github.com/skills/resolve-merge-conflicts/generate)
2725

@@ -48,7 +46,7 @@ Merge conflicts happen when two people make changes to the same file on GitHub
4846
-->
4947

5048
<details id=1>
51-
<summary><h2>:lotus_position: Step 1: Resolve a merge conflict</h2></summary>
49+
<summary><h2>Step 1: Resolve a merge conflict</h2></summary>
5250

5351
_Welcome to "Managing Merge Conflicts"! :wave:_
5452

@@ -82,7 +80,7 @@ This can be intimidating, but have no fear, Git is smart when it comes to mergin
8280
-->
8381

8482
<details id=2>
85-
<summary><h2>:smiling_imp: Step 2: Create your own conflict</h2></summary>
83+
<summary><h2>Step 2: Create your own conflict</h2></summary>
8684

8785
_Good job! You've solved a merge conflict! :tada:_
8886

@@ -111,7 +109,7 @@ We went ahead and added a new file called `references.md` and pushed that change
111109
-->
112110

113111
<details id=3>
114-
<summary><h2>:chipmunk: Step 3: Merge your pull request</h2></summary>
112+
<summary><h2>Step 3: Merge your pull request</h2></summary>
115113

116114
_Almost there! :heart:_
117115

@@ -133,7 +131,7 @@ You can now [merge](https://docs.github.com/en/get-started/quickstart/github-glo
133131
-->
134132

135133
<details id=X>
136-
<summary><h2>:checkered_flag: Finish</h2></summary>
134+
<summary><h2>Finish</h2></summary>
137135

138136
_Congratulations friend, you've completed this course!_
139137

0 commit comments

Comments
 (0)