Resolved Conflicts:
    keyboards/kc60/rules.mk
    keyboards/xd96/rules.mk
    lib/python/qmk/cli/__init__.py
		
	
					 | 
			||
|---|---|---|
| .. | ||
| revc | ||
| satan | ||
| v1p3 | ||
				Resolved Conflicts:
    keyboards/kc60/rules.mk
    keyboards/xd96/rules.mk
    lib/python/qmk/cli/__init__.py
		
	
					 | 
			||
|---|---|---|
| .. | ||
| revc | ||
| satan | ||
| v1p3 | ||