summaryrefslogtreecommitdiff
path: root/.clang-format
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-05-06 23:03:32 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-05-06 23:03:32 +0300
commit3fcc1739663f939c6c67415f1d56b64c35a52a38 (patch)
tree4909e076d5056cf51df1ac20e926c063c3e187cd /.clang-format
parentf655bb1f27fa637ef1889f8bb83bb0d74d645059 (diff)
Resolved merge conflict with SL-13587
Diffstat (limited to '.clang-format')
0 files changed, 0 insertions, 0 deletions