Public Git Hosting - SMMID.git/commit

commit	d9c2e154adeeb60c24643363f4f1ab0a680c362a
author	Lukas Mueller <lam87@cornell.edu>
	Fri, 5 Feb 2021 19:42:30 +0000 (5 14:42 -0500)
committer	Lukas Mueller <lam87@cornell.edu>
	Fri, 5 Feb 2021 19:42:30 +0000 (5 14:42 -0500)
tree	343d8bff10e176da27b3edb605e45495d70d1f39	tree \| snapshot (tar.gz zip)
parent	b0e9c16306cc6f2f188ba2fb5748f317877a19ae	commit \| diff
parent	7bf46926903274b2cb754f4049e50cc9e979d5ec	commit \| diff

fix conflicts.

Code and content behind smmid.org

lib/SMMID/Controller/REST/User.pm	diff1 \|	diff2 \|	blob \| history
mason/smid/detail.mas	diff1 \|	diff2 \|	blob \| history
mason/user.mas	diff1 \|	diff2 \|	blob \| history
root/js/source/entries/smid_detail.js	diff1 \|	diff2 \|	blob \| history