summaryrefslogtreecommitdiff
path: root/build_json.mk
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2021-06-18 09:05:27 +1000
committerGitHub <noreply@github.com>2021-06-18 00:05:27 +0100
commite7ddbc394b7fa88b390435523f70cf30d6b9cea3 (patch)
tree8ea87bd35ae9bdb07f2c85db1c257ed94d3a33e5 /build_json.mk
parent89c01970e333e346c25202e9c568b75cad4c7be5 (diff)
downloadqmk_firmware-e7ddbc394b7fa88b390435523f70cf30d6b9cea3.tar.gz
qmk_firmware-e7ddbc394b7fa88b390435523f70cf30d6b9cea3.zip
Update merge sequence to reflect no-ff, no-squash. (#13038)
Diffstat (limited to 'build_json.mk')
0 files changed, 0 insertions, 0 deletions