Revert wrong conflict solutions following review

keyboards/bastardkb/dilemma/4x6_4/info.json

@@ -34,6 +34,7 @@
         "nkro": true,
         "rgb_matrix": true,
         "caps_word": true
+        "tri_layer": true
     },
     "ws2812": {
         "pin": "GP10",
@@ -194,10 +195,10 @@
             {"matrix": [8, 3], "x": 175, "y": 38, "flags": 4},
             {"matrix": [8, 4], "x": 162, "y": 40, "flags": 4},
             {"matrix": [8, 5], "x": 149, "y": 42, "flags": 4},
-            {"matrix": [9, 4], "x": 170, "y": 51, "flags": 4},
-            {"matrix": [9, 2], "x": 156, "y": 53, "flags": 4},
-            {"matrix": [9, 1], "x": 143, "y": 57, "flags": 4},
-            {"matrix": [9, 3], "x": 132, "y": 64, "flags": 4}
+            {"matrix": [9, 3], "x": 170, "y": 51, "flags": 4},
+            {"matrix": [9, 1], "x": 156, "y": 53, "flags": 4},
+            {"matrix": [9, 2], "x": 143, "y": 57, "flags": 4},
+            {"matrix": [9, 4], "x": 132, "y": 64, "flags": 4}
         ]
     },
     "layouts": {

keyboards/bastardkb/dilemma/4x6_4/rules.mk

@@ -1,8 +1,3 @@
-TRI_LAYER_ENABLE = yes		# Tri Layers
-
-AUDIO_SUPPORTED = no        # Audio is not supported
-RGBLIGHT_SUPPORTED =  no
-
 SERIAL_DRIVER = vendor
 
 POINTING_DEVICE_ENABLE = yes

keyboards/bastardkb/dilemma/readme.md

@@ -10,12 +10,12 @@ A DIY version of the 3x5_2 PCB with promicro compatible footprint is also availa
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bastardkb/dilemma/3x5_3:via
-    make bastardkb/dilemma/4x6_4:via
+    make bastardkb/dilemma/3x5_3:default
+    make bastardkb/dilemma/4x6_4:default
 
 Flashing example for this keyboard:
 
-    make bastardkb/dilemma/3x5_3:via:flash
-    make bastardkb/dilemma/4x6_4:via:flash
+    make bastardkb/dilemma/3x5_3:default:flash
+    make bastardkb/dilemma/4x6_4:default:flash
 
 See the [keyboard build instructions](http://docs.bastardkb.com/)