From 171da5443400364e2260394fa768435bed590f3f Mon Sep 17 00:00:00 2001 From: Kristyn Bryan Date: Mon, 4 Jul 2016 22:25:46 -0400 Subject: [PATCH] Update GithubBranches.md --- unit_03/w08d02/morning_exercise/GithubBranches.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/unit_03/w08d02/morning_exercise/GithubBranches.md b/unit_03/w08d02/morning_exercise/GithubBranches.md index 70dd31a..cde24e4 100644 --- a/unit_03/w08d02/morning_exercise/GithubBranches.md +++ b/unit_03/w08d02/morning_exercise/GithubBranches.md @@ -1,4 +1,3 @@ -``` # GIT BRANCHES AND MERGING ​ ===== LAPTOPS CLOSED ===== @@ -255,4 +254,3 @@ Partner A - repeat the process for get-routes-branch (keep in mind your local get- routes branch will be identical to the remote one so there's no real surprise); - resolve the conflict as you see fit as relevant. - Both partners diagram each process off whiteboard or table! -```