diff options
| author | sijanec <sijanecantonluka@gmail.com> | 2020-05-17 23:27:19 +0200 |
|---|---|---|
| committer | sijanec <sijanecantonluka@gmail.com> | 2020-05-17 23:27:19 +0200 |
| commit | dab29c3db4df35eb9979c0549fb69ec029d38ac8 (patch) | |
| tree | d8b673c9e3e61fa3341e69b7c4d369ee08c694fe /dist/pages/about.html | |
| parent | fixed ToS display (diff) | |
| parent | Revert "Styling fix, lopolis fix" (diff) | |
| download | beziapp-dab29c3db4df35eb9979c0549fb69ec029d38ac8.tar beziapp-dab29c3db4df35eb9979c0549fb69ec029d38ac8.tar.gz beziapp-dab29c3db4df35eb9979c0549fb69ec029d38ac8.tar.bz2 beziapp-dab29c3db4df35eb9979c0549fb69ec029d38ac8.tar.lz beziapp-dab29c3db4df35eb9979c0549fb69ec029d38ac8.tar.xz beziapp-dab29c3db4df35eb9979c0549fb69ec029d38ac8.tar.zst beziapp-dab29c3db4df35eb9979c0549fb69ec029d38ac8.zip | |
Diffstat (limited to 'dist/pages/about.html')
| -rw-r--r-- | dist/pages/about.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dist/pages/about.html b/dist/pages/about.html index 562692d..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> |