Merge remote-tracking branch 'refs/remotes/origin/main'

2026-03-13 16:41:28 +00:00
parent 06c6ba534d e1705efe7c
commit f8a99ac9b3
42 changed files with 1448 additions and 1266 deletions
@@ -1,8 +1,18 @@
 # Default ignored files
 /shelf/
 /workspace.xml
+<<<<<<< HEAD
 # Editor-based HTTP Client requests
 /httpRequests/
 # Datasource local storage ignored files
 /dataSources/
 /dataSources.local.xml
+=======
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+>>>>>>> refs/remotes/origin/main