From 346f5f5e609724bff7eff9064fe0acd1930d7b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20KILI=C3=87?= Date: Thu, 5 Jan 2023 15:24:23 +0300 Subject: [PATCH] resolve conflicit --- docs/en/Migration-Guides/Abp-7_0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/Migration-Guides/Abp-7_0.md b/docs/en/Migration-Guides/Abp-7_0.md index c624fdfd9e..63950a9adc 100644 --- a/docs/en/Migration-Guides/Abp-7_0.md +++ b/docs/en/Migration-Guides/Abp-7_0.md @@ -182,4 +182,4 @@ If you are using replaceable component system you can check [documentation](http ng-zorro-antd-tree.css file should be in angular.json if the user uses AbpTree component or Abp-commercial. The ABP User should add this style definition on angular.json. ( under the 'yourProjectName' > 'architect' > 'build' > 'options' >'styles' ) { "input": "node_modules/ng-zorro-antd/tree/style/index.min.css", "inject": false, "bundleName": "ng-zorro-antd-tree" }, ->>>>>>> 5a38b16b12aa88eeda37f637236f7b79e7f2d152 +