From cdadaac76c2e1e2d537785fbaacbab06ec75b04b Mon Sep 17 00:00:00 2001
From: danijoo <danijob88@googlemail.com>
Date: Thu, 5 Nov 2015 22:35:55 +0100
Subject: [PATCH] update readme

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

diff --git a/README.md b/README.md
index 5625d72..f77e81e 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # UdacityProject4: Build-it-bigger
 A demo app showing how multiple modules work together.
 
-<<<<<<< HEAD
+Base on https://github.com/udacity/ud867/tree/master/FinalProject
 
 # Origininal Readme