resolve conflicit

3 years ago · 346f5f5e60
1 changed files with 1 additions and 1 deletions
--- 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
+