Closed kkda closed 11 years ago
can solve the conflict please?
can you remerge / rebase pls sorry for late reply
https://github.com/AKSW/site.ontowiki/commit/8d8fe38694a638189f44582b216ab9c51121c1d4
can solve the conflict please?