From c044666303a8dd4960583dd05b6e31ab3a7530fc Mon Sep 17 00:00:00 2001
From: Darren Victoriano <darren.victoriano@gmail.com>
Date: Fri, 7 Feb 2025 20:02:02 -0800
Subject: [PATCH] resolve conflivt

---
 images/corne.yaml | 131 ----------------------------------------------
 1 file changed, 131 deletions(-)
 delete mode 100644 images/corne.yaml

diff --git a/images/corne.yaml b/images/corne.yaml
deleted file mode 100644
index bc7b715..0000000
--- a/images/corne.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-layout: {qmk_keyboard: corne_rotated, layout_name: LAYOUT_split_3x6_3}
-layers:
-  default:
-  - $$mdi:keyboard-tab$$
-  - Q
-  - W
-  - E
-  - R
-  - T
-  - Y
-  - U
-  - I
-  - O
-  - P
-  - $$mdi:backspace-outline$$
-  - $$mdi:apple-keyboard-control$$
-  - A
-  - S
-  - D
-  - F
-  - G
-  - H
-  - J
-  - K
-  - L
-  - {t: ;, s: ':'}
-  - RET
-  - $$mdi:apple-keyboard-shift$$
-  - Z
-  - X
-  - C
-  - V
-  - B
-  - N
-  - M
-  - {t: ',', s: <}
-  - {t: ., s: '>'}
-  - {t: /, s: '?'}
-  - $$mdi:apple-keyboard-shift$$
-  - $$mdi:apple-keyboard-command$$
-  - lower
-  - $$mdi:keyboard-space$$
-  - $$mdi:keyboard-space$$
-  - raise
-  - $$mdi:apple-keyboard-option$$
-  lower:
-  - $$mdi:keyboard-esc$$
-  - {t: '1', s: '!'}
-  - {t: '2', s: '@'}
-  - {t: '3', s: '#'}
-  - {t: '4', s: $}
-  - {t: '5', s: '%'}
-  - {t: '6', s: ^}
-  - {t: '7', s: '&'}
-  - {t: '8', s: '*'}
-  - {t: '9', s: (}
-  - {t: '0', s: )}
-  - $$mdi:backspace-reverse-outline$$
-  - $$mdi:apple-keyboard-control$$
-  - ''
-  - ''
-  - Ctl+Sft+$$mdi:keyboard-tab$$
-  - Ctl+$$mdi:keyboard-tab$$
-  - Gui+Sft+J
-  - $$mdi:arrow-left-bold$$
-  - $$mdi:arrow-down-bold$$
-  - $$mdi:arrow-up-bold$$
-  - $$mdi:arrow-right-bold$$
-  - ''
-  - RET
-  - $$mdi:apple-keyboard-shift$$
-  - ''
-  - ''
-  - ''
-  - ''
-  - Gui+Alt+$$mdi:keyboard-space$$
-  - $$mdi:volume-low$$
-  - $$mdi:volume-high$$
-  - ''
-  - ''
-  - ''
-  - $$mdi:apple-keyboard-shift$$
-  - $$mdi:apple-keyboard-command$$
-  - {t: lower, type: held}
-  - $$mdi:keyboard-space$$
-  - $$mdi:keyboard-space$$
-  - raise
-  - $$mdi:apple-keyboard-option$$
-  raise:
-  - $$mdi:keyboard-esc$$
-  - '!'
-  - '@'
-  - '#'
-  - $
-  - '%'
-  - ^
-  - '&'
-  - '*'
-  - +
-  - {t: '=', s: +}
-  - $$mdi:backspace-reverse-outline$$
-  - $$mdi:apple-keyboard-control$$
-  - {t: '`', s: '~'}
-  - '~'
-  - '{'
-  - {t: '[', s: '{'}
-  - (
-  - )
-  - {t: ']', s: '}'}
-  - '}'
-  - {t: \, s: '|'}
-  - '|'
-  - RET
-  - $$mdi:apple-keyboard-shift$$
-  - ''
-  - ''
-  - ''
-  - {t: '''', s: '"'}
-  - '"'
-  - _
-  - {t: '-', s: _}
-  - ''
-  - ''
-  - ''
-  - $$mdi:apple-keyboard-shift$$
-  - $$mdi:apple-keyboard-command$$
-  - lower
-  - $$mdi:keyboard-space$$
-  - $$mdi:keyboard-space$$
-  - {t: raise, type: held}
-  - $$mdi:apple-keyboard-option$$