Set merge style of themes to union

This commit is contained in:

Ates Goral

2015-11-13 23:18:53 -05:00

parent 1afda2cdc1

commit ab0a842820

1 changed files with 1 additions and 0 deletions

.gitattributes

View File

		`@@ -0,0 +1 @@`
							`data/themes.yml merge=union`