Merge branch 'master' into sqlite

2 years ago · 69940064f9
2 changed files with 6 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,3 +1,4 @@
				@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # kvazar-network webapp
 Web-oriented content exploring platform for Kevacoin Blockchain

@ -45,3 +46,5 @@ location @sef {
				@@ -45,3 +46,5 @@ location @sef {

 #### yggdrasil
 [http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7])
+=======
+>>>>>>> master
--- a/public/index.php
+++ b/public/index.php
@ -1,3 +1,4 @@
				@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?php

 require_once('../config.php');
@ -169,3 +170,5 @@ if ($rss) {
				@@ -169,3 +170,5 @@ if ($rss) {
  require_once('index.phtml');

 }
+=======
+>>>>>>> master