autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflict

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/context.jsonld
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"
} }

2
src/page-circle-profile.pug
View File

@ -96,4 +96,4 @@
#circle-edit(hidden) #circle-edit(hidden)
include page-circle-edit.pug include page-circle-edit.pug