fix conflict

golangci · May 13, 2022 · 6e2fa4a · 6e2fa4a
1 parent 987f135
commit 6e2fa4a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/.golangci.example.yml b/.golangci.example.yml
@@ -1695,6 +1695,7 @@ linters:
     - noctx
     - nolintlint
     - nonamedreturns
+    - nosnakecase
     - nosprintfhostport
     - paralleltest
     - prealloc
@@ -1794,6 +1795,7 @@ linters:
     - noctx
     - nolintlint
     - nonamedreturns
+    - nosnakecase
     - nosprintfhostport
     - paralleltest
     - prealloc