fix merge conflicts

Author: jeffkala

.cookiecutter.json

@@ -14,7 +14,7 @@
         "project_with_config_settings": "no",
         "generate_docs": "yes",
         "version": "2.2.0",
-        "original_publish_year": "2025",
+        "original_publish_year": "2020",
         "_drift_manager": {
             "template": "https://github.com/networktocode-llc/cookiecutter-ntc.git",
             "template_dir": "python",
@@ -23,11 +23,7 @@
             "pull_request_strategy": "update-or-create",
             "post_actions": [],
             "draft": false,
-<<<<<<< HEAD
-            "baked_commit_ref": "bc789d65fa90182c0eb392664e1cba02ea187ab1",
-=======
             "baked_commit_ref": "67d15ddeb638efb7c39ab746e97e7b9c96c16801",
->>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
             "drift_managed_branch": "develop"
         }
     }

.github/workflows/release.yml

@@ -17,14 +17,8 @@ jobs:
           poetry-version: "2.1.3"
           python-version: "3.13"
           poetry-install-options: "--no-root"
-<<<<<<< HEAD
-      - name: "Build Documentation"
-        run: "poetry run invoke build build-and-check-docs"
-=======
->>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
       - name: "Run Poetry Build"
         run: "poetry build"
-
       - name: "Check that the release tag matches the version in pyproject.toml"
         run: |
           if [ "${{ github.ref_name }}" != "v$(poetry version -s)" ]; then exit 1; fi
@@ -61,31 +55,20 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/v')"
     needs: "build"
     environment: "pypi"
-<<<<<<< HEAD
-=======
     # Steps to publish to PyPI.
->>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
     steps:
       - name: "Retrieve built package from cache"
         uses: "actions/download-artifact@v4"
         with:
           name: "distfiles"
           path: "dist/"
-<<<<<<< HEAD
-      - name: "Publish package distribution to PyPI"
-        uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e"  # v1.13.0
-        with:
-          user: "__token__"
-          password: "${{ secrets.PYPI_API_TOKEN }}"
-=======
       - name: "Publish package distributions to PyPI"
         uses: "pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e"  # v1.13.0
         ## Used for networktocode org since trusted publisher isn't supported for GitHub Plan.
         with:
           user: "__token__"
           password: "${{ secrets.PYPI_API_TOKEN }}"
         # End publish to PyPI job.
->>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 
   slack-notify:
     needs:

docs/admin/release_notes/version_1.0.md

@@ -6,10 +6,6 @@ This document describes all new features and changes in the release. The format
 
 Initial release of DiffSync.
 
-<<<<<<< HEAD
 ## [v1.0.0] - 2020-10-23
-=======
-## [v1.0.0] - 2026-01-13
->>>>>>> 4a41aa1 (Cookie updated targeting develop by NetworkToCode Cookie Drift Manager Tool)
 
 Initial release