From b678be9347609c4ecaf9cc8b90e74cf2ef4a7e4c Mon Sep 17 00:00:00 2001
From: small-yellow-duck <>
Date: Thu, 17 Nov 2016 20:02:31 -0800
Subject: [PATCH 1/2] i made a change!

---
 code/TODO.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/TODO.md b/code/TODO.md
index a9f6cd2..ca4068a 100644
--- a/code/TODO.md
+++ b/code/TODO.md
@@ -3,6 +3,7 @@
 Suggested changes when experimenting with merges & rebases.
 
 
+* add a comment here!
 * Error checking in `Cattery.add_cats`; Don't allow strings to be passed in
 * Add tests for `Cattery.num_cats` and `Cattery.cats`
 * Change cats to be a dict of attributes or a class - name, color, age, favorite foods, perhaps
\ No newline at end of file

From 47fba1f24e3923ab0819b170b661cc28343d90de Mon Sep 17 00:00:00 2001
From: small-yellow-duck <>
Date: Thu, 17 Nov 2016 20:05:21 -0800
Subject: [PATCH 2/2] all changes

---
 code/TODO.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/TODO.md b/code/TODO.md
index ca4068a..1c8f6e7 100644
--- a/code/TODO.md
+++ b/code/TODO.md
@@ -2,7 +2,6 @@
 
 Suggested changes when experimenting with merges & rebases.
 
-
 * add a comment here!
 * Error checking in `Cattery.add_cats`; Don't allow strings to be passed in
 * Add tests for `Cattery.num_cats` and `Cattery.cats`