diff options
| author | Sam Saccone <samccone@google.com> | 2021-03-04 04:34:54 +0000 |
|---|---|---|
| committer | Sam Saccone <samccone@google.com> | 2021-03-04 04:34:59 +0000 |
| commit | 739bc35d0d6ed5bb84ee30650649dea4d498cea3 (patch) | |
| tree | 13618d03528cd1e212cf55bd05934633e462f936 | |
| parent | ea4d1baa3d6120675bb45c6c700cfd0daad7bbeb (diff) | |
| parent | 8b8bff811148d1b0812f8ea63d1571c3bb48b719 (diff) | |
| download | scapy-739bc35d0d6ed5bb84ee30650649dea4d498cea3.tar.gz | |
resolve merge conflicts of 8b8bff811148d1b0812f8ea63d1571c3bb48b719 to master
Change-Id: Ifa6d484ce66a3fd62f0ec38975b3805036ddac7b
| -rw-r--r-- | OWNERS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -include kernel/tests:/net/test/OWNERS +include kernel/tests:/net/test/OWNERS
\ No newline at end of file |