tests: Fix automatic merge
The merge tool didn't realize that new files from one branch should have a format adhering to that of another branch.
This commit is contained in:
		@ -1,8 +1,5 @@
 | 
				
			|||||||
---
 | 
					---
 | 
				
			||||||
# punctuation
 | 
					# punctuation
 | 
				
			||||||
row_spacing: 0
 | 
					 | 
				
			||||||
button_spacing: 0
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
bounds:
 | 
					bounds:
 | 
				
			||||||
    x: 0
 | 
					    x: 0
 | 
				
			||||||
    y: 0
 | 
					    y: 0
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user