From 1a880ee8ff97040503ad3adfa45a1d8494b78e47 Mon Sep 17 00:00:00 2001
From: viktoriaWeb <viktoria.pikh@gmail.com>
Date: Thu, 2 Nov 2017 22:48:20 +0200
Subject: [PATCH] Update program.py

---
 program.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/program.py b/program.py
index 8c48a7f..62cebd7 100644
--- a/program.py
+++ b/program.py
@@ -1,2 +1,2 @@
-print('merge conflict')
+print('merge conflict+conflict')
 print ('breaking code')