| commit | 739bc35d0d6ed5bb84ee30650649dea4d498cea3 | [log] [tgz] |
|---|---|---|
| author | Sam Saccone <samccone@google.com> | Thu Mar 04 04:34:54 2021 +0000 |
| committer | Sam Saccone <samccone@google.com> | Thu Mar 04 04:34:59 2021 +0000 |
| tree | 13618d03528cd1e212cf55bd05934633e462f936 | |
| parent | ea4d1baa3d6120675bb45c6c700cfd0daad7bbeb [diff] | |
| parent | 8b8bff811148d1b0812f8ea63d1571c3bb48b719 [diff] |
resolve merge conflicts of 8b8bff811148d1b0812f8ea63d1571c3bb48b719 to master Change-Id: Ifa6d484ce66a3fd62f0ec38975b3805036ddac7b
diff --git a/OWNERS b/OWNERS index 756f953..b2d6661 100644 --- a/OWNERS +++ b/OWNERS
@@ -1 +1 @@ -include kernel/tests:net/test/OWNERS +include kernel/tests:/net/test/OWNERS \ No newline at end of file