From 07b061b481b9bb6ec7e51e2d420d592f7290585d Mon Sep 17 00:00:00 2001
From: rdinn001 <42749506+rdinn001@users.noreply.github.com>
Date: Wed, 29 Aug 2018 10:49:18 -0500
Subject: [PATCH] Updated by rdinn001 for testing conflicts

---
 book/portland-zoo.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/book/portland-zoo.md b/book/portland-zoo.md
index 74490ed..b3b29ca 100644
--- a/book/portland-zoo.md
+++ b/book/portland-zoo.md
@@ -11,3 +11,5 @@
 Thinking about visiting the zoo? See the list of events scheduled for [today](http://www.oregonzoo.org/visit/today-zoo)!
 
 ![img](/images/oregon-zoo.png)
+
+Updating the file for checking conflicts