Merge branch 'main' into feat/applicants-page
This commit is contained in:
3 files changed
+34
-20
No files matched your search
@@ -1,6 +1,7 @@
|
||||
mod academics_page;
|
||||
mod additional_page;
|
||||
mod athletics_page;
|
||||
mod closed_form;
|
||||
mod demographics_page;
|
||||
mod eligibility_page;
|
||||
mod extracurriculars_page;
|
||||
@@ -10,12 +11,17 @@ mod form_setup;
|
||||
mod home_page;
|
||||
mod shell;
|
||||
mod specific_requirements_page;
|
||||
<<<<<<< feat/applicants-page
|
||||
=======
|
||||
mod test_display;
|
||||
>>>>>>> main
|
||||
mod university_page;
|
||||
mod work_experience_page;
|
||||
|
||||
pub use academics_page::*;
|
||||
pub use additional_page::*;
|
||||
pub use athletics_page::*;
|
||||
pub use closed_form::*;
|
||||
pub use demographics_page::*;
|
||||
pub use eligibility_page::*;
|
||||
pub use extracurriculars_page::*;
|
||||
@@ -24,5 +30,9 @@ pub use financial_page::*;
|
||||
pub use home_page::*;
|
||||
pub use shell::*;
|
||||
pub use specific_requirements_page::*;
|
||||
<<<<<<< feat/applicants-page
|
||||
=======
|
||||
pub use test_display::*;
|
||||
>>>>>>> main
|
||||
pub use university_page::*;
|
||||
pub use work_experience_page::*;
|
||||
Reference in new issue
Block a user