fixed merge master
commit1282fb7a04d4a02f1c505c1c32745087e4f8be4d
authornickmorales <nmorales3142@gmail.com>
Wed, 25 Jan 2017 22:02:03 +0000 (25 17:02 -0500)
committernickmorales <nmorales3142@gmail.com>
Wed, 25 Jan 2017 22:02:03 +0000 (25 17:02 -0500)
treea0a3b663a849f938d01d5660c01eabb93def6b3a
parent90726f86e130c870e3ba4dc6afc4dc367531886c
parent09f2aeed68b9789691fdcbddb450bedd0590f983
fixed merge master
js/CXGN/BreedersToolbox/AddMultipleTrial.js
js/CXGN/BreedersToolbox/AddTrial.js