diff options
Diffstat (limited to 'dist/pages/about.html')
| -rw-r--r-- | dist/pages/about.html | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dist/pages/about.html b/dist/pages/about.html index 40fb4da..7102567 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,11 +142,8 @@ <div class="row"> <p> <small> -<<<<<<< HEAD - ^HEAD b63b2381a851e2cbc6087bf4d355be4265e6982a -======= - ^HEAD 16d4d4b9f9b35edc7164cd5662ded7377b6960a9 ->>>>>>> 7b0e9737328c2dc5a0ff1bd063cd7818706256c3 + ^HEAD c373dd3a6d4c5acfa6ca44a3c3489146a6a761c6 + </small> </p> </div> </div> |