merge conflict

2019-10-29 14:58:48 +01:00 · 2019-10-29 14:58:48 +01:00 · a80ce71399
commit a80ce71399
parent 250ad6c395 40eeef9d44
2 changed files with 3 additions and 2 deletions
--- a/src/context.jsonld
+++ b/src/context.jsonld
@ -2,5 +2,6 @@
    {
        "inbox": "http://happy-dev.fr/owl/#inbox",
        "object": "http://happy-dev.fr/owl/#object",
-        "author": "http://happy-dev.fr/owl/#author"
+        "author": "http://happy-dev.fr/owl/#author",
+        "account": "http://happy-dev.fr/owl/#account"
    }
--- a/src/page-circle-profile.pug
+++ b/src/page-circle-profile.pug
@ -96,4 +96,4 @@
      

  #circle-edit(hidden)
-    include page-circle-edit.pug
+    include page-circle-edit.pug