From f31ec20745e5020c8384a4fdd52df2defdc3c396 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 21 Feb 2020 09:46:01 +0000
Subject: [PATCH] .conflicts

git-svn-id: svn://ultimatepp.org/upp/trunk@14060 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index a8faec8e5..187ea884b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
 # Ultimate++
 
+<<<<<<< HEAD
 ![alt text](uppbox/uppweb/Resources/Images/Logo.png?raw=true& "Ultimate++ Logo")
+=======
+![alt text](uppbox/uppweb/Resources/Images/Logo.png?raw=true "Ultimate++ Logo")
+>>>>>>> Added logo to README.md
 
 Ultimate++ is a C++ cross-platform rapid application development framework focused on programmers productivity. It includes a set of libraries (GUI, SQL, etc.), and an integrated development environment.