diff options
Diffstat (limited to 'doc/development/ee_features.md')
| -rw-r--r-- | doc/development/ee_features.md | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index 932a44f65e4..eb33d17443a 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -380,3 +380,9 @@ to avoid conflicts during CE to EE merge. } } ``` + +## gitlab-svgs + +Conflicts in `app/assets/images/icons.json` or `app/assets/images/icons.svg` can +be resolved simply by regenerating those assets with +[`yarn run svg`](https://gitlab.com/gitlab-org/gitlab-svgs). |