Merge the hotfix.

ashdar · Aug 24, 2018 · 9c81818 · 9c81818
2 parents 24a15fc + f529b76
commit 9c81818
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -3,3 +3,7 @@ This is an experimental repository that lets me play with branching. This is not
 
 These are the notes for UI Feature 01. Blah Blah.
 There was a woman from Nantucket.
+
+Modified for the hot fix 1001.
+
+
diff --git a/hotfix-1001.txt b/hotfix-1001.txt
@@ -0,0 +1 @@
+Hot fix for showstopper 1001
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,7 @@ This is an experimental repository that lets me play with branching. This is not

		These are the notes for UI Feature 01. Blah Blah.
		There was a woman from Nantucket.

		Modified for the hot fix 1001.