Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

_conflicts.html.haml

Blame Permalink

Forked from GitLab.org / GitLab FOSS

9903 commits behind the upstream repository.

8 years ago
822534c4
Replace link to Resolve conflicts with buttons · 822534c4
Sam Rose authored 8 years ago
```
Use variables for display logic conditional checks
```
822534c4

History
Replace link to Resolve conflicts with buttons
Sam Rose authored 8 years ago
```
Use variables for display logic conditional checks
```

_conflicts.html.haml 918 B