From f9ba4c2966a9f3795a433e07ac7be33aef08af0a Mon Sep 17 00:00:00 2001 From: christopher barragan Date: Tue, 15 Nov 2016 15:17:33 -0600 Subject: [PATCH 1/2] made changes to the animal readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f4a0156..78bae65 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,6 @@ List of random stuff -- dogs -- cats -- ducks +- dogs are cool +- cats are alright +- ducks are scary From 94f18e804965b7cc2aeacfbc934b01e7cf1e3b2a Mon Sep 17 00:00:00 2001 From: christopher barragan Date: Tue, 15 Nov 2016 16:06:27 -0600 Subject: [PATCH 2/2] i like COWS more than dogs --- README.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0231439..216c1db 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,9 @@ ls List of random stuff <<<<<<< HEAD -- dogs are cool -- cats are alright -- ducks are scary -======= -- dogs -- cats -- ducks +- COWs +- COws +- More COWS - TACOS - BURRITOS - PIZZA ->>>>>>> 84f293babfe2a1689620158cb63bc53323b7d485