From 22cfe19c39f26058328d6caf4d25d02e12e6f803 Mon Sep 17 00:00:00 2001 From: Mohammad Hattawy <mohammad.hattawy@gmail.com> Date: Fri, 26 May 2017 10:10:50 -0500 Subject: [PATCH] checkout the conflict --- con.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 con.txt diff --git a/con.txt b/con.txt new file mode 100644 index 0000000..6ffa433 --- /dev/null +++ b/con.txt @@ -0,0 +1 @@ +creating the conflict -- GitLab