From 00b66b0267c404a7c8faf11fb8959834daac88e2 Mon Sep 17 00:00:00 2001
From: "tudor.stanciu" <tudor.stanciu94@gmail.com>
Date: Tue, 19 Feb 2019 01:05:41 +0200
Subject: [PATCH] test

---
 Notes.orig | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 Notes.orig

diff --git a/Notes.orig b/Notes.orig
new file mode 100644
index 0000000..f034b4d
--- /dev/null
+++ b/Notes.orig
@@ -0,0 +1,6 @@
+<<<<<<< HEAD
+test commit
+test commit 2
+=======
+test commit
+>>>>>>> aa8e536bf0c81319b1cbf92ce26cb3de3083e759