mirror of
https://gitlab.com/dwt1/dotfiles.git
synced 2026-10-08 11:39:07 +11:00
Compare commits
2
Commits
d6579bc5cd
...
93a81ce5d0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
93a81ce5d0 | ||
|
|
89afe60bb5 |
@@ -712,6 +712,9 @@
|
||||
"trigger": "?"
|
||||
}
|
||||
},
|
||||
<<<<<<< HEAD
|
||||
"configVersion": 18
|
||||
=======
|
||||
<<<<<<< HEAD
|
||||
"clipboardClickToPaste": false,
|
||||
"clipboardEnterToPaste": false,
|
||||
@@ -747,4 +750,5 @@
|
||||
=======
|
||||
"configVersion": 17
|
||||
>>>>>>> b69401d40ffc4572b43c84aa3403316530a91db9
|
||||
>>>>>>> d6579bc5cdd464ac1c0c2a39f06a2e19b461864f
|
||||
}
|
||||
Reference in New Issue
Block a user