Skip to content

Commit

Permalink
git subrepo pull (merge) --force LspCpp
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "LspCpp"
  merged:   "87a67d162"
upstream:
  origin:   "git@github.com:vectorgraphics/LspCpp"
  branch:   "master"
  commit:   "87a67d162"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
  • Loading branch information
johncbowman committed Mar 23, 2024
1 parent a45d527 commit 92e96dd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions LspCpp/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = git@github.com:vectorgraphics/LspCpp
branch = master
commit = b978a914b2e16bee273199ba9e5632e1a9519fad
parent = 315ca8cbe34cee0b5079bd669060b568da7b342a
commit = 87a67d1623e03cc5f3b054e7529a42f6b19c2869
parent = a45d527a2a81bb8662b4ca8a25ed287a739ccfed
method = merge
cmdver = 0.4.6
6 changes: 5 additions & 1 deletion LspCpp/include/LibLsp/lsp/ClientPreferences.h
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@ class ClientPreferences

bool isTrue(const optional<bool>& value)
{
return value.get_value_or(false);
if (value) {
return *value;
} else {
return false;
}
}

bool isRenameDynamicRegistrationSupported() {
Expand Down

0 comments on commit 92e96dd

Please sign in to comment.