CONFLICT

tests/contest/contest/src/main.rs

@@ -22,10 +22,7 @@ use crate::tests::linux_ns_itype::get_ns_itype_tests;
 use crate::tests::mounts_recursive::get_mounts_recursive_test;
 use crate::tests::no_pivot::get_no_pivot_test;
 use crate::tests::pidfile::get_pidfile_test;
-<<<<<<< HEAD
-=======
 use crate::tests::process::get_process_test;
->>>>>>> main
 use crate::tests::process_oom_score_adj::get_process_oom_score_adj_test;
 use crate::tests::process_rlimits::get_process_rlimits_test;
 use crate::tests::process_user::get_process_user_test;
@@ -158,10 +155,7 @@ fn main() -> Result<()> {
     tm.add_test_group(Box::new(process_user));
     tm.add_test_group(Box::new(process_rlimtis));
     tm.add_test_group(Box::new(no_pivot));
-<<<<<<< HEAD
     tm.add_test_group(Box::new(kill));
-=======
->>>>>>> main
     tm.add_test_group(Box::new(process_oom_score_adj));
 
     tm.add_test_group(Box::new(io_priority_test));