fix conflict

sivchari · sivchari · commit 6e2fa4ae8903 · 2022-05-13T11:26:25.000+09:00
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
