From 860517b12ad42b72a1350394a7f3cdbc5f4f4f5f Mon Sep 17 00:00:00 2001 From: p3ls Date: Mon, 13 Mar 2023 18:38:08 +0100 Subject: [PATCH] d --- trash2/test.txt | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 trash2/test.txt diff --git a/trash2/test.txt b/trash2/test.txt new file mode 100644 index 0000000..597bf7e --- /dev/null +++ b/trash2/test.txt @@ -0,0 +1,32 @@ +foo +foo +foo +foo +bar +bar +bar +bar +bar +bar +bar +bar +bar +bar +bar +bar +bar +bla +bla +<<<<<<< HEAD +bar +bar +bla +======= +>>>>>>> parent of 73942cd (update) +bla +foo +foo +foo +foo +foo +f \ No newline at end of file