From 8dffa867dc6c689458e0c8f56e17e1dde79ac37e Mon Sep 17 00:00:00 2001
From: rimonsh <rimonsh@mta.ac.il>
Date: Fri, 10 Mar 2023 09:21:29 +0200
Subject: [PATCH 1/3] Adding contribution1.txt

---
 contribution1.txt | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 contribution1.txt

diff --git a/contribution1.txt b/contribution1.txt
new file mode 100644
index 0000000..9a924a1
--- /dev/null
+++ b/contribution1.txt
@@ -0,0 +1,9 @@
+Mauris tortor ligula, vestibulum eget metus eget,
+vulputate rutrum lectus. Suspendisse ac hendrerit
+nunc. Nulla varius lectus vitae massa auctor feugiat.
+Nulla mattis lacus leo, in egestas ex eleifend vitae.
+Praesent ullamcorper eros a mauris lacinia, eu
+ullamcorper tortor dapibus. Sed eget vehicula felis.
+Donec vitae ipsum id risus condimentum consequat in a
+mi. Integer sollicitudin sit amet nunc vitae
+sollicitudin. Duis tincidunt sapien id ultrices

From 57569746ea580d3bce0a5c47c5dfc74d7fccf799 Mon Sep 17 00:00:00 2001
From: rimonsh <rimonsh@mta.ac.il>
Date: Fri, 10 Mar 2023 10:14:26 +0200
Subject: [PATCH 2/3] Adding contribution2.txt

---
 contribution2.txt | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 contribution2.txt

diff --git a/contribution2.txt b/contribution2.txt
new file mode 100644
index 0000000..6810e51
--- /dev/null
+++ b/contribution2.txt
@@ -0,0 +1,7 @@
+Nam suscipit ante nec eros consectetur pretium. Etiam
+lacinia blandit molestie. Nam pulvinar nibh elit, vel
+condimentum ante accumsan a. Vivamus tellus lectus,
+pretium nec erat id, porttitor consequat sapien.
+Pellentesque porttitor tincidunt metus. Donec vitae
+fringilla nulla. Praesent pretium mollis erat, et
+vestibulum nisi tempus a.
\ No newline at end of file

From 11cb9f61e7f95d7f57b8be47ef532e002905acad Mon Sep 17 00:00:00 2001
From: rimonsh <rimonsh@mta.ac.il>
Date: Fri, 10 Mar 2023 11:52:47 +0200
Subject: [PATCH 3/3] changing file

---
 .DS_Store | Bin 0 -> 6148 bytes
 file2.txt |   4 ++++
 file3.txt |   9 ++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..ea1157510ecc3c963e8fa816d1aac37619fc224f
GIT binary patch
literal 6148
zcmeHKO;5r=5PgdrAYM3n>>t3!_y-z-H{(H~UM*0Sgb!2NL~i}*zM0t&5x96D#LOhK
zZ+E`7`?l$J0fa$4y#aavI#j_{m(2kYzv!N{qD3%hjayu!!WXK~YA@Oi=g5HUT^Dbd
zVU7Yn_HTS&ud9;Y8AjM(&3!GfK#FIq7+bSn(3)b1oW7jBCyoo0YAu<!VC0gc4@OIy
zbCj}IVnTdpM5Vql-<k<yrTT7OiZLs0w9XWL#@E!9M&*2p-+rsvXEm8^u4`Iyrh>VT
zI{yYQ%sRH_hq&egjGW`<`7=2K&VV!UM+SIii*zmxy>$kh0cT*#fP5bks$dqeG1N~7
z8@&P$+cc}NFLw#aNg`$u8$)_1!BUBq8sZfrSUT-VjLRZ6hL(<?GqX;dIm8=E(AjBE
zG#nu_^wt@026h>^uwhTm|GVS&|J@`XIRnnXzhWS?hoj+uONwXf-s0q}O{lL_5s7OI
kw<+xCQOsC5im#|Dv?tObW)T}hS}6V_pfq^n44jmKZ-Y8UkN^Mx

literal 0
HcmV?d00001

diff --git a/file2.txt b/file2.txt
index 7867bc3..d3c82c6 100644
--- a/file2.txt
+++ b/file2.txt
@@ -3,8 +3,12 @@ sollicitudin nunc, sit amet sodales leo sapien et sem.
 Maecenas mauris eros, sollicitudin at elit in,
 pellentesque
 mattis orci. Aliquam elementum finibus dictum.
+<<<<<<< HEAD
 
 CHANGED BY MAINTAINER
 
+=======
+CHANGED BY CONTRIBUTOR
+>>>>>>> ccbd94b (changing files)
 Integer ac nibh nec est porttitor semper ultrices eu
 ligula. Etiam sodales porttitor venenatis.
\ No newline at end of file
diff --git a/file3.txt b/file3.txt
index b355bc0..d6835d4 100644
--- a/file3.txt
+++ b/file3.txt
@@ -1,5 +1,12 @@
 Quisque nec lectus viverra, tempus mi molestie, posuere
 mauris. Nam iaculis ac eros eget bibendum. Phasellus
 egestas fringilla libero sed viverra.
+<<<<<<< HEAD
 
-CHANGED BY MAINTAINER
\ No newline at end of file
+CHANGED BY MAINTAINER
+=======
+Proin hendrerit convallis nibh ac gravida. Integer
+placerat
+accumsan nibh, vitae bibendum urna ullamcorper in.
+ADDED BY CONTRIBUTOR
+>>>>>>> ccbd94b (changing files)