1. ajung
  2. pp.client-plone

Commits

ajung  committed 94853f9

fix

  • Participants
  • Parent commits 33dbcfc
  • Branches master

Comments (0)

Files changed (1)

File src/pp.client-plone/pp/client/plone/browser/configure.zcml

View file
 
     <browser:page
       name="asHTML"
-<<<<<<< HEAD
       layer="pp.client.plone.interfaces.IPloneClientConnectorLayer"            
       for="Products.ATContentTypes.interface.topic.IATTopic"
-=======
-      for="Products.ATContentTypes.interface.image.IATImage"
       permission="zope2.View"
       class=".types.image.HTMLView"
       />
     <browser:page
       name="asHTML"
       for="plone.app.collection.interfaces.ICollection"
->>>>>>> 16c40cb907d171b08171d9f618ee4b81214e5880
+      layer="pp.client.plone.interfaces.IPloneClientConnectorLayer"            
       permission="zope2.View"
       class=".types.topic.HTMLView"
       />