forgot to save the merged content
This commit is contained in:
parent
dfb013f9c0
commit
10f6ca7861
1 changed files with 0 additions and 3 deletions
|
@ -12,11 +12,8 @@ module.exports = {
|
||||||
"behavior/layers",
|
"behavior/layers",
|
||||||
"behavior/misc",
|
"behavior/misc",
|
||||||
"behavior/mod-tap",
|
"behavior/mod-tap",
|
||||||
<<<<<<< HEAD
|
|
||||||
"behavior/reset",
|
"behavior/reset",
|
||||||
=======
|
|
||||||
"behavior/tap-hold",
|
"behavior/tap-hold",
|
||||||
>>>>>>> 9a06bdb... feat(docs): add tap hold documentation
|
|
||||||
"behavior/lighting",
|
"behavior/lighting",
|
||||||
],
|
],
|
||||||
Development: [
|
Development: [
|
||||||
|
|
Loading…
Add table
Reference in a new issue