fixes after merging with main

This commit is contained in:
Daniel Goc
2026-04-14 13:19:48 +02:00
parent 604247b7c8
commit c610ce38cc
2 changed files with 6 additions and 12 deletions

View File

@@ -3,14 +3,6 @@ package perms
type Permission string
const (
<<<<<<< HEAD
UserReadAny Permission = "user.read.any"
UserWriteAny Permission = "user.write.any"
UserDeleteAny Permission = "user.delete.any"
CurrencyWrite Permission = "currency.write"
ViewAllOrders Permission = "orders.view"
ModifyAllOrders Permission = "orders.modify"
=======
UserReadAny Permission = "user.read.any"
UserWriteAny Permission = "user.write.any"
UserDeleteAny Permission = "user.delete.any"
@@ -20,5 +12,6 @@ const (
ProductTranslationSave Permission = "product_translation.save"
ProductTranslationTranslate Permission = "product_translation.translate"
SearchCreateIndex Permission = "search.create_index"
>>>>>>> e5988a85f32e0b3324f6d9f48254355fbffd559e
OrdersViewAll Permission = "orders.view_all"
OrdersModifyAll Permission = "orders.modify_all"
)