Skip to content

Commit 4d64df5

Browse files
iphydfzoff99
authored andcommitted
cleanup: Minor cleanup of event unpack code.
1 parent 3044f1b commit 4d64df5

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

other/bootstrap_daemon/docker/tox-bootstrapd.sha256

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<<<<<<< HEAD
33
<<<<<<< HEAD
44
<<<<<<< HEAD
5+
<<<<<<< HEAD
56
7dfcf534fb80fbd8337337f5aa9eaa120febc72386046c7ab0d5c7545e900657 /usr/local/bin/tox-bootstrapd
67
=======
78
cbc0080745e6606a0267be2e39cf56366010512be7e8167afe0dfad176441c7a /usr/local/bin/tox-bootstrapd
@@ -11,6 +12,8 @@ cbc0080745e6606a0267be2e39cf56366010512be7e8167afe0dfad176441c7a /usr/local/bin
1112
>>>>>>> 12fab0ced (cleanup: Remove all uses of `SIZEOF_VLA`.)
1213
=======
1314
>>>>>>> 959219b01 (refactor: Rename `system_{memory,...}` to `os_{memory,...}`.)
15+
=======
16+
>>>>>>> e60ae0bc8 (cleanup: Minor cleanup of event unpack code.)
1417
cbc0080745e6606a0267be2e39cf56366010512be7e8167afe0dfad176441c7a /usr/local/bin/tox-bootstrapd
1518
=======
1619
c028527fe5eecde7daa6ac9dacc47bd4bb765463e8e4b5af3881789797bf81a8 /usr/local/bin/tox-bootstrapd
@@ -27,4 +30,10 @@ c028527fe5eecde7daa6ac9dacc47bd4bb765463e8e4b5af3881789797bf81a8 /usr/local/bin
2730
=======
2831
48ed699a0da0282b7e12142648a322198a2f2af791df3fb49bbe3f7e41afadc4 /usr/local/bin/tox-bootstrapd
2932
>>>>>>> bdf460a3a (refactor: Rename `system_{memory,...}` to `os_{memory,...}`.)
33+
<<<<<<< HEAD
3034
>>>>>>> 959219b01 (refactor: Rename `system_{memory,...}` to `os_{memory,...}`.)
35+
=======
36+
=======
37+
7dfcf534fb80fbd8337337f5aa9eaa120febc72386046c7ab0d5c7545e900657 /usr/local/bin/tox-bootstrapd
38+
>>>>>>> 6aa9e6850 (cleanup: Minor cleanup of event unpack code.)
39+
>>>>>>> e60ae0bc8 (cleanup: Minor cleanup of event unpack code.)

0 commit comments

Comments
 (0)