Commit 58bd04ab authored by Sean McGivern's avatar Sean McGivern

Merge branch 'limit_ee_conflicts-gitlab-svgs' into 'master'

Update limit_ee_conflicts.md with assets/gitlab-svgs conflict resolution.

See merge request gitlab-org/gitlab-ce!15361
parents 126e7301 8fdd459c
Pipeline #13910491 passed with stages
in 55 minutes and 27 seconds
......@@ -336,6 +336,12 @@ Blocks of code that are EE-specific should be moved to partials as much as
possible to avoid conflicts with big chunks of HAML code that that are not fun
to resolve when you add the indentation in the equation.
### Assets
#### 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).
---
[Return to Development documentation](README.md)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment