diff --git a/owners.txt b/owners.txt index 91699125fcd..af6b578bd31 100644 --- a/owners.txt +++ b/owners.txt @@ -3,6 +3,7 @@ <<<<<<< Updated upstream <<<<<<< Updated upstream <<<<<<< Updated upstream +<<<<<<< Updated upstream 133448/msiedlarek 133486/karsany 133482/ollivetti @@ -99,6 +100,9 @@ ======= 133533/avanek >>>>>>> Stashed changes +======= +133533/avanek +>>>>>>> Stashed changes 133576/greyrl 133514/mauroao 133613/anton-wego @@ -202,6 +206,7 @@ <<<<<<< Updated upstream <<<<<<< Updated upstream <<<<<<< Updated upstream +<<<<<<< Updated upstream seriousben transloadit >>>>>>> Stashed changes @@ -245,3 +250,5 @@ rsese >>>>>>> Stashed changes ======= >>>>>>> Stashed changes +======= +>>>>>>> Stashed changes