Mirrors/CppCoreGuidelines
1
0
Fork 0
mirror of https://github.com/isocpp/CppCoreGuidelines.git synced 2025-12-17 20:54:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #736 from tkruse/git-conflict

Browse Source 
Remove merged git conflict
This commit is contained in:
Andrew Pardoe
2016-09-26 10:58:06 -07:00
committed by GitHub
parent 157e7a9d9e 13efb300b1
commit a75e33abc5
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/python/Makefile.in
View File

@@ -11,13 +11,6 @@ CXX_SRCS := $(wildcard *.cpp)
CXX_LINT := ${CXX_SRCS:.cpp=.lint} CXX_LINT := ${CXX_SRCS:.cpp=.lint}
.PHONY: cpplint-all .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: cpplint-all:
@python ../../python/cpplint_wrap.py *.cpp @python ../../python/cpplint_wrap.py *.cpp
>>>>>>> 084eb29d426688617b6e19846f508b6d1cb3a564