- Fix conflicts

atomics/T1552.001/T1552.001.yaml

@@ -83,7 +83,7 @@ atomic_tests:
 
   executor:
     name: sh
-    elevation_required: false # Indicates whether command must be run with admin privileges. If the elevation_required attribute is not defined, the value is assumed to be false.
+    elevation_required: false
     command: |
       for file in $(find / -name .netrc 2> /dev/null);do echo $file ; cat $file ; done 
 - name: WinPwn - sensitivefiles

atomics/T1560.002/T1560.002.yaml

@@ -23,12 +23,13 @@ atomic_tests:
   - description: |
       Requires Python
     prereq_command: |
-      which_python=`which python3`; $which_python -V
+      which python || which python3
     get_prereq_command: |
   executor:
     name: sh
     elevation_required: false
     command: |
+      which_python=`which python || which python3`
       $which_python -c "import gzip;input_file=open('#{path_to_input_file}', 'rb');content=input_file.read();input_file.close();output_file=gzip.GzipFile('#{path_to_output_file}','wb',compresslevel=6);output_file.write(content);output_file.close();"
     cleanup_command: |
       rm #{path_to_output_file}
@@ -53,12 +54,13 @@ atomic_tests:
   - description: |
       Requires Python
     prereq_command: |
-      which_python=`which python3`; $which_python -V
+      which python || which python3
     get_prereq_command: |
   executor:
     name: sh
     elevation_required: false
     command: |
+      which_python=`which python || which python3`
       $which_python -c "import bz2;input_file=open('#{path_to_input_file}','rb');content=input_file.read();input_file.close();bz2content=bz2.compress(content,compresslevel=9);output_file=open('#{path_to_output_file}','w+');output_file.write(str(bz2content));output_file.close();"
     cleanup_command: |
       rm #{path_to_output_file}
@@ -83,12 +85,13 @@ atomic_tests:
   - description: |
       Requires Python
     prereq_command: |
-      which_python=`which python3`; $which_python -V
+      which python || which python3
     get_prereq_command: |
   executor:
     name: sh
     elevation_required: false
     command: |
+      which_python=`which python || which python3`
       $which_python -c "from zipfile import ZipFile; ZipFile('#{path_to_output_file}', mode='w').write('#{path_to_input_file}')"
     cleanup_command: |
       rm #{path_to_output_file}
@@ -113,12 +116,13 @@ atomic_tests:
   - description: |
       Requires Python
     prereq_command: |
-      which_python=`which python3`; $which_python -V
+      which python || which python3
     get_prereq_command: |
   executor:
     name: sh
     elevation_required: false
     command: |
+      which_python=`which python || which python3`
       $which_python -c "from zipfile import ZipFile; ZipFile('#{path_to_output_file}', mode='w').write('#{path_to_input_file}')" 
     cleanup_command: |
       rm #{path_to_output_file}