From 1f6f456d10a221c2a22fb1e6b73cef7f98d8af31 Mon Sep 17 00:00:00 2001
From: Ralph <blackbirdralph@aol.com>
Date: Wed, 14 Apr 2021 09:03:42 -0400
Subject: [PATCH] Update serverconfig.sample.php

---
 web/serverconfig.sample.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/serverconfig.sample.php b/web/serverconfig.sample.php
index b5baf75..8607994 100644
--- a/web/serverconfig.sample.php
+++ b/web/serverconfig.sample.php
@@ -36,7 +36,6 @@ define('YAAMP_SITE_NAME', 'YiiMP');
 define('YAAMP_ADMIN_EMAIL', 'yiimp@spam.la');
 define('YAAMP_ADMIN_IP', ''); // samples: "80.236.118.26,90.234.221.11" or "10.0.0.1/8"
 define('YAAMP_ADMIN_WEBCONSOLE', true);
-<<<<<<< HEAD
 define('YAAMP_NOTIFY_NEW_COINS', true);
 define('YAAMP_DEFAULT_ALGO', 'lbry');
 define('YAAMP_CREATE_NEW_COINS', false);