chore: fixed merge conflict

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
-name: 'Wordlist request'
-about: 'Suggest a wordlist to be added'
+name: 'Wordlist/Feature request'
+about: 'Suggest a wordlist/feature to be added'
 title: '[Feature request]: '
 labels: 'enhancement' # Alt: proposal
 assignees: ''

.github/PULL_REQUEST_TEMPLATE/pull_request.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-<!--- Hello! Thank you for contributing to SecLists. It is recommended to open an issue to get feedback and track the issue. -->
+<!--- Please make sure you've checked the CONTRIBUTING.md before creating a pull-request: https://github.com/danielmiessler/SecLists/blob/master/CONTRIBUTING.md -->
 
 **Describe the added commits**
 <!--- A clear and concise description of what is being added to the repository. -->

.github/workflows/remote-wordlists-updater.yml

@@ -1,8 +1,8 @@
-name: Wordlist Updater - Trickest wordlists updater
+name: Wordlist Updater - Remote wordlists updater
 
 on:
   schedule:
-  - cron: 0 0 * * *
+  - cron: 0 * * * *
   
   workflow_dispatch:
 
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       
       - name: Update lists
-        run: ./.bin/trickest-updater.sh
+        run: ./.bin/wordlist-updaters/updater.py
           
       - name: Commit files if changed
         run: |
@@ -25,7 +25,7 @@ jobs:
               echo "[+] No files were changed"
           else
               echo "[+] Files were changed! Pushing changed..."
-              git add -A
+              git add --renormalize -A && git add -A
               git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY
               git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
               git config --local user.name "github-actions[bot]"

.github/workflows/wordlist-validator.yml

@@ -28,4 +28,6 @@ jobs:
         uses: tj-actions/changed-files@v34
       - name: Analyze all added or modified files
         run: |
-          ./.bin/validators.py "${{ steps.changed-files.outputs.all_changed_files }}"
+          ./.bin/validators.py
+        env:
+          CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }}