summaryrefslogtreecommitdiffstats
path: root/dist/pages
diff options
context:
space:
mode:
Diffstat (limited to 'dist/pages')
-rw-r--r--dist/pages/about.html4
-rw-r--r--dist/pages/tos.html4
2 files changed, 6 insertions, 2 deletions
diff --git a/dist/pages/about.html b/dist/pages/about.html
index e9d1152..bb04c16 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,7 +142,11 @@
<div class="row">
<p>
<small>
+<<<<<<< HEAD
+ ^HEAD fa9467811859cd9c2d595f5a79819ce3aca91e26
+=======
^HEAD b8d872d3487cbe1b6ce510bb08da799b31bd5567
+>>>>>>> b0d7eb0101a6c8a26c97a1c7069e4496706225ec
</small>
</p>
</div>
diff --git a/dist/pages/tos.html b/dist/pages/tos.html
index 2c11641..384b2d3 100644
--- a/dist/pages/tos.html
+++ b/dist/pages/tos.html
@@ -38,7 +38,7 @@
<body>
<nav class="z-depth-0" id="navigation-main">
<div class="nav-wrapper container">
- <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> &raquo; <x-su>theTos</x-su>
+ <b class="app-header-bold">Beži</b><span class="app-header-span">App</span> &raquo; <x-su>theToS</x-su>
<span class="right white-text">
<i class="material-icons" id="nav-home-button">home</i>
</span>
@@ -57,7 +57,7 @@
<li class="flow-text has-line-data" data-line-start="8" data-line-end="9"><x-su>termsOfUseExploit</x-su>;</li>
<li class="flow-text has-line-data" data-line-start="9" data-line-end="11"><x-du>termsOfUseSpam</x-du></li>
</ol>
- <p class="flow-text"><x-du>termsOfUseModify<x-du></p>
+ <p class="flow-text"><x-du>termsOfUseModify</x-du></p>
<h3 class="code-line" data-line-start=11 data-line-end=12><a id="Termination_of_services_11"></a><x-su>terminationOfServices</x-su></h3>
<p class="flow-text has-line-data" data-line-start="12" data-line-end="13"><x-su>terminationOfServicesDescriptions</x-su>:</p>
<ul>