Changed line end to UNIX.

rwthmoodle · May 30, 2023 · cc0f732 · cc0f732
1 parent b653808
commit cc0f732
Show file tree

Hide file tree

Showing 10 changed files with 12,830 additions and 12,836 deletions.
diff --git a/.github/workflows/moodle-plugin-ci.yml b/.github/workflows/moodle-plugin-ci.yml
@@ -28,33 +28,27 @@ jobs:
       fail-fast: false
       matrix:
         include:
-<<<<<<< HEAD
-=======
           - php: 8.1
             moodle-branch: MOODLE_401_STABLE
             database: pgsql
           - php: 8.1
             moodle-branch: MOODLE_401_STABLE
             database: mariadb
 
->>>>>>> 123e1fd (Pdfannotator comment subscription like forum fixes #20.)
           - php: 8.0
             moodle-branch: MOODLE_401_STABLE
             database: pgsql
           - php: 8.0
             moodle-branch: MOODLE_401_STABLE
             database: mariadb
 
-<<<<<<< HEAD
           - php: 8.0
             moodle-branch: MOODLE_400_STABLE
             database: pgsql
           - php: 8.0
             moodle-branch: MOODLE_400_STABLE
             database: mariadb
 
-=======
->>>>>>> 123e1fd (Pdfannotator comment subscription like forum fixes #20.)
           - php: 7.4
             moodle-branch: MOODLE_401_STABLE
             database: pgsql
@@ -159,4 +153,4 @@ jobs:
 
       - name: Behat features
         if: ${{ always() }}
-        run: moodle-plugin-ci behat --profile chrome
+        run: moodle-plugin-ci behat --profile chrome