# Conflicts: # indra/newview/app_settings/settings.xml # scripts/messages/message_template.msg.sha1 |
||
|---|---|---|
| .. | ||
| build.yaml | ||
| build_viewer.yml | ||
| cla.yaml | ||
| label.yaml | ||
| pre-commit.yaml | ||
| stale.yaml | ||
# Conflicts: # indra/newview/app_settings/settings.xml # scripts/messages/message_template.msg.sha1 |
||
|---|---|---|
| .. | ||
| build.yaml | ||
| build_viewer.yml | ||
| cla.yaml | ||
| label.yaml | ||
| pre-commit.yaml | ||
| stale.yaml | ||