diff options
Diffstat (limited to 'dist/pages')
| -rw-r--r-- | dist/pages/about.html | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/dist/pages/about.html b/dist/pages/about.html index bb04c16..d357ecf 100644 --- a/dist/pages/about.html +++ b/dist/pages/about.html @@ -142,11 +142,7 @@ <div class="row"> <p> <small> -<<<<<<< HEAD - ^HEAD fa9467811859cd9c2d595f5a79819ce3aca91e26 -======= - ^HEAD b8d872d3487cbe1b6ce510bb08da799b31bd5567 ->>>>>>> b0d7eb0101a6c8a26c97a1c7069e4496706225ec + ^HEAD b989d252515d9d8e636f1c86cdfb71bb68938a30 </small> </p> </div> |