melissa/zsa_qmk_firmware
1
0
Fork 0
mirror of https://github.com/zsa/qmk_firmware.git synced 2026-04-13 04:27:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix weird merge conflicts
Some checks failed
Build firmware / build-firmware (default) (push) Has been cancelled
Details
Build firmware / build-firmware (oryx) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Drashna Jael're
2025-04-06 02:53:15 -07:00
parent a806e7b0fd
commit ea1b1179f8
3 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/tap_hold_configurations/chordal_hold/default/config.h
View File

@@ -1,9 +1,5 @@
<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/default/config.h
/* Copyright 2022 Vladislav Kucheriavykh
* Copyright 2024 Google LLC
========
/* Copyright 2024 ThanhSon.Mech
>>>>>>>> origin/master:keyboards/trnthsn/e8ghty/halconf.h
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,11 +17,5 @@
#pragma once
<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/default/config.h
#include "test_common.h"
#define CHORDAL_HOLD
========
#define HAL_USE_SPI TRUE
#include_next <halconf.h>
>>>>>>>> origin/master:keyboards/trnthsn/e8ghty/halconf.h

11
tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h
View File

@@ -1,9 +1,5 @@
<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h
/* Copyright 2022 Vladislav Kucheriavykh
* Copyright 2024 Google LLC
========
/* Copyright 2022 QMK
>>>>>>>> origin/master:keyboards/deemen17/de80/halconf.h
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,13 +17,6 @@
#pragma once
<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h
#include "test_common.h"
#define CHORDAL_HOLD
#define HOLD_ON_OTHER_KEY_PRESS
========
#define HAL_USE_SPI TRUE
#include_next <halconf.h>
>>>>>>>> origin/master:keyboards/deemen17/de80/halconf.h

4
tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h
View File

@@ -19,11 +19,7 @@
#include "test_common.h"
<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h
#define CHORDAL_HOLD
========
// place overrides here
>>>>>>>> origin/master:keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h
#define PERMISSIVE_HOLD
#define RETRO_SHIFT 2 * TAPPING_TERM