Include comment from cisagov/skeleton-generic#222

This also resolves a conflict from the follow-on merge of
cisagov/skeleton-generic#222.

Co-authored-by: Nick M <50747025+mcdonnnj@users.noreply.github.com>

Author: jsf9k

.github/labeler.yml

@@ -19,22 +19,13 @@ dependencies:
           # Add any dependency files used.
           - .pre-commit-config.yaml
           - requirements*.txt
-<<<<<<< HEAD
+# Enable if Docker is used in the repository.
 docker:
   - changed-files:
       - any-glob-to-any-file:
           - "**/compose*.yml"
           - "**/docker-compose*.yml"
           - "**/Dockerfile*"
-=======
-# Enable if Docker is used in the repository.
-# docker:
-#   - changed-files:
-#       - any-glob-to-any-file:
-#           - "**/compose*.yml"
-#           - "**/docker-compose*.yml"
-#           - "**/Dockerfile*"
->>>>>>> e447508101ff8a9afeae0894a25d6adb6416c854
 documentation:
   - changed-files:
       - any-glob-to-any-file: