This is an automated email from the ASF dual-hosted git repository.

kdump pushed a commit to branch query-server-time-info
in repository https://gitbox.apache.org/repos/asf/skywalking-query-protocol.git

commit 2d430b7439f73927afa20fec0bc8fac9b63dc20c
Merge: fe0c418 246f887
Author: x22x22 <[email protected]>
AuthorDate: Sun Sep 22 12:13:14 2019 +0800

    Merge remote-tracking branch 'origin/master' into query-server-time-info
    
    # Conflicts:
    #   metadata.graphqls

 .vscode/settings.json | 3 +++
 1 file changed, 3 insertions(+)

diff --cc .vscode/settings.json
index 0000000,0000000..7c2feb7
new file mode 100644
--- /dev/null
+++ b/.vscode/settings.json
@@@ -1,0 -1,0 +1,3 @@@
++{
++  "editor.formatOnSave": false
++}

Reply via email to