Skip to content

Commit 42aa322

Browse files
author
Philippe Gil
committed
Merge branch 'topic/gil-edge-automatic-merges-219' into 'edge'
fix merge conflict See merge request eng/ide/ada_language_server!1548
2 parents 2a83d24 + 45863f4 commit 42aa322

File tree

14 files changed

+3
-741
lines changed

14 files changed

+3
-741
lines changed

‎testsuite/gpr_lsp/import_using_space_string/others/test.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎testsuite/gpr_lsp/import_using_space_string/others/prj.gpr renamed to ‎testsuite/gpr_lsp/import_using_space_string/prj.gpr

File renamed without changes.

‎testsuite/gpr_lsp/import_using_space_string/others/test.json renamed to ‎testsuite/gpr_lsp/import_using_space_string/test.json

File renamed without changes.

‎testsuite/gpr_lsp/import_using_space_string/test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
title: 'check with " "; support'

‎testsuite/gpr_lsp/import_using_space_string/windows/prj.gpr

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎testsuite/gpr_lsp/import_using_space_string/windows/test.json

Lines changed: 0 additions & 254 deletions
This file was deleted.

‎testsuite/gpr_lsp/import_using_space_string/windows/test.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎testsuite/gpr_lsp/invalid_file_name_support/others/test.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎testsuite/gpr_lsp/invalid_file_name_support/others/prj.gpr renamed to ‎testsuite/gpr_lsp/invalid_file_name_support/prj.gpr

File renamed without changes.

‎testsuite/gpr_lsp/invalid_file_name_support/others/test.json renamed to ‎testsuite/gpr_lsp/invalid_file_name_support/test.json

File renamed without changes.

0 commit comments

Comments
 (0)