kvazar/webapp
1
0
Fork 0
mirror of https://github.com/kvazar-network/webapp.git synced 2025-02-03 10:46:04 +00:00
Code Issues Projects Releases Wiki Activity

fix merge errors

Browse Source
This commit is contained in:
d47081 2023-03-14 02:23:13 +02:00
parent 7e4b18b2e0
commit 7c86464d64
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -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])

5
public/index.php
View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
<?php
require_once('../config.php');
@ -169,6 +168,4 @@ if ($rss) {
require_once('index.phtml');
}
=======
>>>>>>> master
}