Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						e578434ba8
					
				
					 3 changed files with 3 additions and 3 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard": "technicpad",
 | 
			
		||||
    "keyboard": "handwired/technicpad",
 | 
			
		||||
    "keymap": "default",
 | 
			
		||||
    "layers": [
 | 
			
		||||
        ["KC_A", "KC_B", "KC_C", "KC_D"]
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
{
 | 
			
		||||
    "keyboard": "technicpad",
 | 
			
		||||
    "keyboard": "handwired/technicpad",
 | 
			
		||||
    "keymap": "via",
 | 
			
		||||
    "config": {
 | 
			
		||||
        "features": {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
{
 | 
			
		||||
   "keyboard": "mechwild/bb40",
 | 
			
		||||
   "keyboard": "mechwild/bb40/f401",
 | 
			
		||||
   "keymap": "default",
 | 
			
		||||
   "version": 1,
 | 
			
		||||
   "layout": "LAYOUT_all",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue