Revert changes for ccm.yml

.github/workflows/ccm.yml

@@ -4,13 +4,8 @@ on:
   push:
     # takes muliple branch names
     branches: 
-<<<<<<< HEAD
       - main
-=======
-      - master
->>>>>>> a7ff2ea (Adding a github actions file)
       - '[0-9][0-9][0-9][0-9].[0-9][0-9].*' # 2021.01.x
-      - i404_backend_update
     tags:
       - '[0-9][0-9][0-9][0-9].[0-9][0-9].[0-9][0-9]' # 2021.01.01
 
@@ -26,20 +21,12 @@ env:
 jobs:
   build:
     # to test a feature, change the repo name to your github id
-    if: github.repository_owner == 'tl-its-umich-edu' || github.repository_owner == 'pushyamig'
+    if: github.repository_owner == 'tl-its-umich-edu'
     runs-on: ubuntu-latest
     steps:
 
       - name: Checkout code 
-<<<<<<< HEAD
-<<<<<<< HEAD
         uses: actions/checkout@v4
-=======
-        uses: actions/checkout@v3
->>>>>>> a7ff2ea (Adding a github actions file)
-=======
-        uses: actions/checkout@v4
->>>>>>> 9878d68 (updating the github action repos version)
 
       - name: Extract branch name
         id: extract_branch
@@ -51,15 +38,7 @@ jobs:
           docker build . --tag ghcr.io/${{ env.REPO_URL }}:${BRANCH_NAME}
       
       - name: Login to GitHub Container Registry
-<<<<<<< HEAD
-<<<<<<< HEAD
-        uses: docker/login-action@v3
-=======
-        uses: docker/login-action@v2
->>>>>>> a7ff2ea (Adding a github actions file)
-=======
         uses: docker/login-action@v3
->>>>>>> 9878d68 (updating the github action repos version)
         with:
             registry: ghcr.io
             username: ${{ github.actor }}
@@ -71,19 +50,11 @@ jobs:
     
   release: 
      # Making sure that release only runs for tag pushes
-    if: startsWith(github.ref, 'refs/tags/') && github.repository_owner == 'pushyamig'
+    if: startsWith(github.ref, 'refs/tags/') && github.repository_owner == 'tl-its-umich-edu'
     needs: build # This ensures the build job finishes successfully before starting this job
     runs-on: ubuntu-latest
     steps:
-<<<<<<< HEAD
-<<<<<<< HEAD
-      - uses: actions/checkout@v4
-=======
-      - uses: actions/checkout@v3
->>>>>>> a7ff2ea (Adding a github actions file)
-=======
       - uses: actions/checkout@v4
->>>>>>> 5bf1369 (Git action version update)
 
       - name: Draft Release
         id: create_release