Fixed git conflict in bundle
Fixed git conflict in bundle

open-sausages/silverstripe-assets-gallery,open-sausages/silverstripe-asset-admin,silverstripe/silverstripe-asset-admin,silverstripe/silverstripe-asset-admin,open-sausages/silverstripe-assets-gallery,open-sausages/silverstripe-asset-admin