From 50a7183dba1ac4515a4b7aa578e546ebb9935958 Mon Sep 17 00:00:00 2001
From: d47081 <noreply@localhost>
Date: Tue, 14 Mar 2023 02:15:10 +0200
Subject: [PATCH] resolve merge #8 conflicts

---
 README.md        | 0
 public/index.php | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 README.md
 create mode 100644 public/index.php

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/public/index.php b/public/index.php
new file mode 100644
index 0000000..e69de29