diff options
| author | Luke Drummond <luke.drummond@codeplay.com> | 2024-10-17 14:49:26 +0100 |
|---|---|---|
| committer | Luke Drummond <luke.drummond@codeplay.com> | 2024-10-17 14:49:26 +0100 |
| commit | 9d98acb196a40fee5229afeb08f95fd36d41c10a (patch) | |
| tree | 57dc141655ada1d09d761cfe49bdf83cc6f29051 /lldb/test/API/python_api | |
| parent | dccebddb3b802c4c1fe287222e454b63f850f012 (diff) | |
| download | llvm-9d98acb196a40fee5229afeb08f95fd36d41c10a.zip llvm-9d98acb196a40fee5229afeb08f95fd36d41c10a.tar.gz llvm-9d98acb196a40fee5229afeb08f95fd36d41c10a.tar.bz2 | |
Renormalize line endings whitespace only after dccebddb3b80
Line ending policies were changed in the parent, dccebddb3b80. To make
it easier to resolve downstream merge conflicts after line-ending
policies are adjusted this is a separate whitespace-only commit. If you
have merge conflicts as a result, you can simply `git add --renormalize
-u && git merge --continue` or `git add --renormalize -u && git rebase
--continue` - depending on your workflow.
Diffstat (limited to 'lldb/test/API/python_api')
| -rw-r--r-- | lldb/test/API/python_api/debugger/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/test/API/python_api/debugger/Makefile b/lldb/test/API/python_api/debugger/Makefile index bfad5f3..99998b2 100644 --- a/lldb/test/API/python_api/debugger/Makefile +++ b/lldb/test/API/python_api/debugger/Makefile @@ -1,3 +1,3 @@ -CXX_SOURCES := main.cpp
-
-include Makefile.rules
+CXX_SOURCES := main.cpp + +include Makefile.rules |