Fix conflict

2026-02-16 10:40:57 +00:00 · 2020-07-03 23:24:10 +03:00
parent aa86662d9f
commit 61f79385ea
281 changed files with 712 additions and 1940 deletions
--- a/src/admin/page_example_graph.php
+++ b/src/admin/page_example_graph.php
--- a/src/admin/page_saved_graph.php
+++ b/src/admin/page_saved_graph.php
--- a/src/admin/page_test_graphcgi.php
+++ b/src/admin/page_test_graphcgi.php
--- a/src/admin/page_vote.php
+++ b/src/admin/page_vote.php
--- a/src/donate.php
+++ b/src/donate.php
--- a/src/graphs_examples.php
+++ b/src/graphs_examples.php
@@ -10,4 +10,4 @@ foreach ($examples as $item)
 {
    $g_lang["m_keyWords"] .= ", " . $item["title_" . $g_lang["current_language"]];
 }
-?>
+?>
--- a/src/graphs_examples_func.php
+++ b/src/graphs_examples_func.php
--- a/src/vote_func.php
+++ b/src/vote_func.php