diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-07-13 15:03:34 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-07-13 15:03:34 -0400 |
| commit | 515d4f1e93bcf9160c8b41d5a90b3144388f706f (patch) | |
| tree | b7d039f8c2030186d99eddba0160264fb99c191a /Makefile.am | |
| parent | eb427f309cbe2eb82769fdec4e9b7a7249c3287b (diff) | |
| parent | 0acc3ae87904ca5d9bd430a5a89f89dd97f9ec85 (diff) | |
| download | tor-515d4f1e93bcf9160c8b41d5a90b3144388f706f.tar.gz tor-515d4f1e93bcf9160c8b41d5a90b3144388f706f.zip | |
Merge branch 'maint-0.4.3' into maint-0.4.4
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 1a1fa9b658..8a26c6403b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -274,8 +274,7 @@ check-local: \ check-changes \ check-includes \ check-best-practices \ - shellcheck \ - check-cocci + shellcheck # test-network requires a copy of Chutney in $CHUTNEY_PATH. # Chutney can be cloned from https://git.torproject.org/chutney.git . |