From 47539789eb832c45464c036181379614b759439c Mon Sep 17 00:00:00 2001
From: Kate Lyons <lyons6@wisc.edu>
Date: Tue, 15 Jan 2019 13:31:09 -0600
Subject: [PATCH] resolved conflicts in README with two countries

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1f853db..5e1343f 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # countries
-United States
\ No newline at end of file
+Romania
+United States
-- 
GitLab