make gendepen

open-telemetry · Mar 10, 2023 · 8fba8b4 · 8fba8b4
1 parent 4177473
commit 8fba8b4
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1097,16 +1097,8 @@ updates:
     schedule:
       interval: "weekly"
       day: "wednesday"
-<<<<<<< HEAD
   - package-ecosystem: "gomod"
     directory: "/testbed/mockdatareceivers/mockawsxrayreceiver"
     schedule:
       interval: "weekly"
       day: "wednesday"
-  - package-ecosystem: "gomod"
-    directory: "/testbed/mockdatasenders/mockdatadogagentexporter"
-    schedule:
-      interval: "weekly"
-      day: "wednesday"
-=======
->>>>>>> make gendependabot