diff options
| author | sijanec <sijanecantonluka@gmail.com> | 2020-05-18 00:34:23 +0200 |
|---|---|---|
| committer | sijanec <sijanecantonluka@gmail.com> | 2020-05-18 00:34:23 +0200 |
| commit | 17de6574b4e4871162c81da0232b9db4113e0245 (patch) | |
| tree | 72d960e80cc3821db17d0d3dc494f324d9e31837 /dist/pages | |
| parent | window.onerror (diff) | |
| parent | Merge branch 'dev' of github.com:beziapp/beziapp.github.io into dev (diff) | |
| download | beziapp-17de6574b4e4871162c81da0232b9db4113e0245.tar beziapp-17de6574b4e4871162c81da0232b9db4113e0245.tar.gz beziapp-17de6574b4e4871162c81da0232b9db4113e0245.tar.bz2 beziapp-17de6574b4e4871162c81da0232b9db4113e0245.tar.lz beziapp-17de6574b4e4871162c81da0232b9db4113e0245.tar.xz beziapp-17de6574b4e4871162c81da0232b9db4113e0245.tar.zst beziapp-17de6574b4e4871162c81da0232b9db4113e0245.zip | |
Diffstat (limited to 'dist/pages')
| -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 a32a331..8dd6f27 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,11 @@ <div class="row"> <p> <small> +<<<<<<< HEAD ^HEAD bed93d7d52a80a05cd87c5eeacdcafde8cafe24a +======= + ^HEAD b0d7eb0101a6c8a26c97a1c7069e4496706225ec +>>>>>>> 837a4ad3f49cb4441d294e67332b98818fc90011 </small> </p> </div> |