Skip to content
Snippets Groups Projects
Commit b016d6c7 authored by CSchank's avatar CSchank
Browse files

fix merge conflict

parents 1c4d70e1 b860864c
No related branches found
No related tags found
No related merge requests found
......@@ -5,4 +5,5 @@ Num, Last Name, First Name, e-mail, GitHub ID, Supervisor, Project Name, Project
3,Lin,Junwei,lin523@mcmaster.ca,Lychee-acaca,Dr. Shiva Kumar,RwaveDetection,ECG signal processing and R-wave detection,traditional,No,User manual,https://github.com/Lychee-acaca/CAS741,main,TBD,TBD,
4, Jimoh, Aliyah, jimoha1@mcmaster.ca, AliyahJimoh, Dr. Matthew Giamou, 2D-Localizer, 2-D Localization for Mobile Robots, traditional, Yes, N/A, https://github.com/AliyahJimoh/CAS-741-2D-Localizer, main, TBD, TBD,
5, Singh, Kiran, singhk56@mcmaster.ca, KiranSingh15, Dr. Matthew Giamou, CAS-741-Image-Correspondences, Image Feature Correspondences for Camera Calibration, traditional, Yes, User Manual, https://github.com/KiranSingh15/CAS-741-Image-Correspondences, main, TBD, TBD,
6, Ahmadi, Yasmin, ahmady3@mcmaster.ca, YasminAhmadi, Dr. Christian Brodbeck, NeuroMap, Integration of Predictive Algorithms for Mapping to Neural Activity, Traditional, Yes, User manual, https://github.com/YasminAhmadi/CAS-741, main, TBD, TBD,
7, Schankula, Christopher, schankuc@mcmaster.ca, CSchank, Dr. Spencer Smith and Dr. Jacques Carette, Drasil Tensors, Adding Tensors, Matrices, and Vectors to Drasil, Other (Meta-Drasil), Yes, Possible research or arXiv paper, https://github.com/CSchank/TensorCodeGen, main, No, Dr. Jacques Carette
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment