Merge branch 'MDL-71365' of https://github.com/stronk7/moodle

moodle · Apr 19, 2021 · 727bb77 · 727bb77
2 parents 5459965 + 2d287b8
commit 727bb77
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.grunt/tasks/ignorefiles.js b/.grunt/tasks/ignorefiles.js
@@ -41,7 +41,7 @@ module.exports = grunt => {
             '*/**/yui/src/*/meta/',
             '*/**/build/',
         ].concat(thirdPartyPaths);
-        grunt.file.write('.eslintignore', eslintIgnores.join('\n'));
+        grunt.file.write('.eslintignore', eslintIgnores.join('\n') + '\n');
 
         // Generate .stylelintignore.
         const stylelintIgnores = [
@@ -50,7 +50,7 @@ module.exports = grunt => {
             'theme/boost/style/moodle.css',
             'theme/classic/style/moodle.css',
         ].concat(thirdPartyPaths);
-        grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
+        grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
     };
 
     grunt.registerTask('ignorefiles', 'Generate ignore files for linters', handler);

diff --git a/theme/boost/thirdpartylibs.xml b/theme/boost/thirdpartylibs.xml
@@ -41,13 +41,6 @@
     <license>(MIT)</license>
     <version>v4.6.0</version>
     <licenseversion></licenseversion>
-  </library>
-    <library>
-    <location>amd/src/index.js</location>
-    <name>bootstrap-util</name>
-    <license>(MIT)</license>
-    <version>v4.6.0</version>
-    <licenseversion></licenseversion>
   </library>
   <library>
     <location>amd/src/bootstrap/modal.js</location>
@@ -105,6 +98,13 @@
     <version>v4.6.0</version>
     <licenseversion></licenseversion>
   </library>
+  <library>
+    <location>amd/src/index.js</location>
+    <name>bootstrap-util</name>
+    <license>(MIT)</license>
+    <version>v4.6.0</version>
+    <licenseversion></licenseversion>
+  </library>
   <library>
     <location>scss/fontawesome</location>
     <name>Font Awesome by Dave Gandy - http://fontawesome.io</name>