--- a/web/views/owl.py	Thu Dec 03 17:17:43 2009 +0100
+++ b/web/views/owl.py	Mon Dec 07 05:09:09 2009 -0800
@@ -71,15 +71,9 @@
         if writeprefix:
             self.w(OWL_CLOSING_ROOT)
 
-<<<<<<< /home/syt/src/fcubicweb/cubicweb/web/views/owl.py
-    def should_display_rschema(self, rschema):
-        return not rschema in self.skiptypes and (
-            rschema.has_local_role('read') or
-            rschema.has_perm(self._cw, 'read'))
-=======
     def should_display_rschema(self, eschema, rschema, tschemas, role):
-        return rschema.may_have_permissions('read', self.req, eschema, role)
->>>>>>> /tmp/owl.py~other.-maWGS
+        return not rschema in self.skiptypes and ( 
+            rschema.may_have_permissions('read', self._cw, eschema, role))
 
     def visit_schema(self, skiptypes):
         """get a layout for a whole schema"""