resolve git conflicts
Go to file
erinn a1ecf98373 Update 'LICENSE' 2020-11-27 14:27:57 -08:00
LICENSE Update 'LICENSE' 2020-11-27 14:27:57 -08:00
gitfix initial commit 2020-01-29 13:50:36 -08:00