Fix additional conflicts

Signed-off-by: lelia <le1ia@me.com>
ossf · Jun 25, 2024 · 0834d0c · 0834d0c
2 parents f6b9e23 + 37cbd35
commit 0834d0c
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 20 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -47164,10 +47164,6 @@ function wrappy (fn, cb) {
 /***/ }),
 
 /***/ 4351:
-<<<<<<< HEAD
->>>>>>> 37cbd35 (:seedling: Add step to validate the dist folder content (#84))
-=======
->>>>>>> e282306 (Rebuild dist files)
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const core = __nccwpck_require__(2186)
@@ -49327,10 +49323,6 @@ module.exports = {"i8":"3.1.10"};
 /***/ }),
 
 /***/ 5324:
-<<<<<<< HEAD
->>>>>>> 37cbd35 (:seedling: Add step to validate the dist folder content (#84))
-=======
->>>>>>> e282306 (Rebuild dist files)
 /***/ ((module) => {
 
 "use strict";

diff --git a/dist/issue.ejs b/dist/issue.ejs
@@ -17,9 +17,3 @@ There are changes in the following repositories:
 <%_ }); -%> 
 
 _Report generated by [OpenSSF Scorecard Monitor](https://github.com/ossf/scorecard-monitor)._
-<<<<<<< HEAD
-=======
-_Report generated by [ossf/scorecard-monitor.com/ossf/scorecard-mossf/scorecard-monitor
->>>>>>> 37cbd35 (:seedling: Add step to validate the dist folder content (#84))
-=======
->>>>>>> e282306 (Rebuild dist files)
diff --git a/dist/report.ejs b/dist/report.ejs
@@ -13,9 +13,3 @@
 <%_ }); -%>
 
 _Report generated by [OpenSSF Scorecard Monitor](https://github.com/ossf/scorecard-monitor)._
-<<<<<<< HEAD
-=======
-_Report generated by [ossf/scorecard-monitor](https://github.com/ossf/scorecard-monitor)._
->>>>>>> 37cbd35 (:seedling: Add step to validate the dist folder content (#84))
-=======
->>>>>>> e282306 (Rebuild dist files)