2024-12-12

ipitio · Dec 12, 2024 · b7f7fd2 · b7f7fd2
1 parent e901e48
commit b7f7fd2
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/owners.txt b/owners.txt
@@ -1,6 +1,7 @@
 <<<<<<< Updated upstream
 =======
 >>>>>>> Stashed changes
+<<<<<<< Updated upstream
 128237/clicknpunch
 128244/dchide01
 128175/heysuck
@@ -81,6 +82,8 @@
 128589/thetechdept
 128249/vrai
 130896/pkp
+=======
+>>>>>>> Stashed changes
 134730/alphaonelabs
 128190/jkgurto
 132833/onixmedia
@@ -149,3 +152,8 @@
 128304/rainerstudhalter
 128310/thebos1
 128279/islocated
+<<<<<<< Updated upstream
+=======
+mickaelandrieu
+vmware
+>>>>>>> Stashed changes