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