mirror of
https://github.com/isocpp/CppCoreGuidelines.git
synced 2024-03-22 13:30:58 +08:00
Remove merged git conflict
This commit is contained in:
parent
157e7a9d9e
commit
13efb300b1
|
@ -11,13 +11,6 @@ CXX_SRCS := $(wildcard *.cpp)
|
|||
CXX_LINT := ${CXX_SRCS:.cpp=.lint}
|
||||
|
||||
.PHONY: cpplint-all
|
||||
<<<<<<< HEAD
|
||||
cpplint-all: $(CXX_LINT)
|
||||
|
||||
%.lint: %.cpp
|
||||
@python ../../python/cpplint.py --verbose=0 --linelength=100 --filter=-legal/copyright,-build/include_order,-build/namespaces,-build/include,-build/include_subdir,-readability/inheritance,-readability/casting,-readability/namespace,-readability/alt_tokens,-readability/braces,-readability/fn_size,-whitespace/comments,-whitespace/braces,-whitespace/empty_loop_body,-whitespace/indent,-whitespace/newline,-runtime/explicit,-runtime/arrays,-runtime/int,-runtime/references,-runtime/string,-runtime/operator $< || (cat $< | nl -ba | grep -v 'md-split' && false)
|
||||
=======
|
||||
cpplint-all:
|
||||
@python ../../python/cpplint_wrap.py *.cpp
|
||||
>>>>>>> 084eb29d426688617b6e19846f508b6d1cb3a564
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user