Fixed merge error
This commit is contained in:
Родитель
3f71b61ae6
Коммит
bbc3af4196
|
@ -57,5 +57,4 @@ entityMappings:
|
|||
columnName: Activity
|
||||
- identifier: Category
|
||||
columnName: Rule
|
||||
columnName: URLCustomEntity
|
||||
version: 1.0.0
|
||||
|
|
|
@ -57,5 +57,4 @@ entityMappings:
|
|||
columnName: Activity
|
||||
- identifier: Category
|
||||
columnName: Rule
|
||||
columnName: URLCustomEntity
|
||||
version: 1.0.0
|
||||
|
|
|
@ -57,5 +57,4 @@ entityMappings:
|
|||
columnName: Activity
|
||||
- identifier: Category
|
||||
columnName: Rule
|
||||
columnName: URLCustomEntity
|
||||
version: 1.0.0
|
||||
|
|
|
@ -56,6 +56,5 @@ entityMappings:
|
|||
- identifier: Name
|
||||
columnName: Activity
|
||||
- identifier: Category
|
||||
columnName: Rule
|
||||
columnName: URLCustomEntity
|
||||
columnName: Rule
|
||||
version: 1.0.0
|
||||
|
|
Загрузка…
Ссылка в новой задаче