From 3d2e99586988fa70971b8edbaa557e5756c5be14 Mon Sep 17 00:00:00 2001
From: d47081 <noreply@localhost>
Date: Tue, 14 Mar 2023 02:21:08 +0200
Subject: [PATCH] fix merge errors

---
 README.md        | 5 +----
 public/index.php | 3 ---
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 7e35bf8..954cafe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # kvazar-network webapp
 Web-oriented content exploring platform for Kevacoin Blockchain
 
@@ -45,6 +44,4 @@ location @sef {
 ### examples
 
 #### yggdrasil
-[http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7])
-=======
->>>>>>> master
+[http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7])
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index 3970c11..8dd0d04 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 
 require_once('../config.php');
@@ -170,5 +169,3 @@ if ($rss) {
   require_once('index.phtml');
 
 }
-=======
->>>>>>> master