diff options
| author | sijanec <sijanecantonluka@gmail.com> | 2020-05-17 22:29:59 +0200 |
|---|---|---|
| committer | sijanec <sijanecantonluka@gmail.com> | 2020-05-17 22:29:59 +0200 |
| commit | fb3562344b75865754e3da52fa0c053e493b69af (patch) | |
| tree | 48d53e317e86813021d5cf1af2ea85d03d8fa068 /dist/pages | |
| parent | CSS (diff) | |
| parent | Bug fix attempt (diff) | |
| download | beziapp-fb3562344b75865754e3da52fa0c053e493b69af.tar beziapp-fb3562344b75865754e3da52fa0c053e493b69af.tar.gz beziapp-fb3562344b75865754e3da52fa0c053e493b69af.tar.bz2 beziapp-fb3562344b75865754e3da52fa0c053e493b69af.tar.lz beziapp-fb3562344b75865754e3da52fa0c053e493b69af.tar.xz beziapp-fb3562344b75865754e3da52fa0c053e493b69af.tar.zst beziapp-fb3562344b75865754e3da52fa0c053e493b69af.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 f04883f..40fb4da 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,7 +142,11 @@ <div class="row"> <p> <small> +<<<<<<< HEAD ^HEAD b63b2381a851e2cbc6087bf4d355be4265e6982a +======= + ^HEAD 16d4d4b9f9b35edc7164cd5662ded7377b6960a9 +>>>>>>> 7b0e9737328c2dc5a0ff1bd063cd7818706256c3 </p> </div> </div> |