diff options
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> |