Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		@@ -1,9 +1,9 @@
 | 
			
		||||
{
 | 
			
		||||
    "keyboard_name": "bm60v2_poker",
 | 
			
		||||
    "url": "",
 | 
			
		||||
    "maintainer": "qmk",
 | 
			
		||||
    "maintainer": "bdtc123",
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT": {
 | 
			
		||||
        "LAYOUT_60_ansi": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"x":0, "y":0},
 | 
			
		||||
                {"x":1, "y":0},
 | 
			
		||||
@@ -60,7 +60,7 @@
 | 
			
		||||
                {"x":9.25, "y":3},
 | 
			
		||||
                {"x":10.25, "y":3},
 | 
			
		||||
                {"x":11.25, "y":3},
 | 
			
		||||
                {"x":14, "y":3,"w":2.75},
 | 
			
		||||
                {"x":12.25, "y":3,"w":2.75},
 | 
			
		||||
 | 
			
		||||
                {"x":0, "y":4, "w":1.25},
 | 
			
		||||
                {"x":1.25, "y":4, "w":1.25},
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user