Resolve merge conflict

htop-dev · Jun 7, 2023 · 4f1c91f · 4f1c91f
2 parents e1154d3 + d8fe027
commit 4f1c91f
Show file tree

Hide file tree

Showing 163 changed files with 6,249 additions and 4,318 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,6 +7,3 @@ updates:
     directory: /
     schedule:
       interval: weekly
-    labels:
-      - 'type: dependencies'
-      - 'github-actions'
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -11,7 +11,7 @@ jobs:
     name: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
       with:
         submodules: true
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -151,7 +151,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install Dependencies
-      run: brew install automake
+      run: brew install automake pkg-config
     - name: Bootstrap
       run: ./autogen.sh
     - name: Configure

diff --git a/.gitignore b/.gitignore
@@ -51,3 +51,6 @@ callgrind.out.*
 # IDE workspace configurations
 /.idea/
 /.vscode/
+
+# Language Servers
+/.cache/clangd/