fix merge issues

Merge remote-tracking branch 'origin/master'
Gearknobs (Gravit Designer): add US-OH 2013 Avatar
2021-12-28 00:06:50 +00:00 · 2021-12-28 00:05:29 +00:00 · 2021-12-28 00:03:35 +00:00
3 changed files with 8 additions and 2 deletions
--- a/exports/Gearknobs_GBClassicAvatar.png
+++ b/exports/Gearknobs_GBClassicAvatar.png
--- a/exports/Gearknobs_USOH2013Avatar.png
+++ b/exports/Gearknobs_USOH2013Avatar.png
--- a/projects/GravitDesigner/Gearknobs.gvdesign
+++ b/projects/GravitDesigner/Gearknobs.gvdesign
Author	SHA1	Message	Date
Ducky	e65e03f641	fix merge issues	2021-12-28 00:06:50 +00:00
Ducky	89a4d1883f	Merge remote-tracking branch 'origin/master'	2021-12-28 00:05:29 +00:00
Ducky	5289e803e1	Gearknobs (Gravit Designer): add US-OH 2013 Avatar	2021-12-28 00:03:35 +00:00