Browse Source

fix merge errors

sqlite
d47081 2 years ago
parent
commit
3d2e995869
  1. 5
      README.md
  2. 3
      public/index.php

5
README.md

@ -1,4 +1,3 @@ @@ -1,4 +1,3 @@
<<<<<<< HEAD
# kvazar-network webapp
Web-oriented content exploring platform for Kevacoin Blockchain
@ -45,6 +44,4 @@ location @sef { @@ -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])

3
public/index.php

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

Loading…
Cancel
Save