merge conflict

This commit is contained in:
Gaëlle Morin 2019-10-29 14:58:48 +01:00
commit a80ce71399
2 changed files with 3 additions and 2 deletions

View File

@ -2,5 +2,6 @@
{ {
"inbox": "http://happy-dev.fr/owl/#inbox", "inbox": "http://happy-dev.fr/owl/#inbox",
"object": "http://happy-dev.fr/owl/#object", "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"
} }