Skip to content

Commit 3044f1b

Browse files
iphydfzoff99
authored andcommitted
refactor: Rename system_{memory,...} to os_{memory,...}.
This rename happens in the system PR, so I'm pulling it out to reduce the size of that PR.
1 parent 294e051 commit 3044f1b

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
@@ -1,13 +1,16 @@
11
<<<<<<< HEAD
22
<<<<<<< HEAD
33
<<<<<<< HEAD
4+
<<<<<<< HEAD
45
7dfcf534fb80fbd8337337f5aa9eaa120febc72386046c7ab0d5c7545e900657 /usr/local/bin/tox-bootstrapd
56
=======
67
cbc0080745e6606a0267be2e39cf56366010512be7e8167afe0dfad176441c7a /usr/local/bin/tox-bootstrapd
78
>>>>>>> 80ac793b3 (feat: allow the large custom NGC packets to be handled also by the client)
89
=======
910
=======
1011
>>>>>>> 12fab0ced (cleanup: Remove all uses of `SIZEOF_VLA`.)
12+
=======
13+
>>>>>>> 959219b01 (refactor: Rename `system_{memory,...}` to `os_{memory,...}`.)
1114
cbc0080745e6606a0267be2e39cf56366010512be7e8167afe0dfad176441c7a /usr/local/bin/tox-bootstrapd
1215
=======
1316
c028527fe5eecde7daa6ac9dacc47bd4bb765463e8e4b5af3881789797bf81a8 /usr/local/bin/tox-bootstrapd
@@ -18,4 +21,10 @@ c028527fe5eecde7daa6ac9dacc47bd4bb765463e8e4b5af3881789797bf81a8 /usr/local/bin
1821
=======
1922
8a2cc2e20ac0688b42c6e6211cb1bc5797c276ed52a2322d8b786f8ad562d535 /usr/local/bin/tox-bootstrapd
2023
>>>>>>> 5c093c488 (cleanup: Remove all uses of `SIZEOF_VLA`.)
24+
<<<<<<< HEAD
2125
>>>>>>> 12fab0ced (cleanup: Remove all uses of `SIZEOF_VLA`.)
26+
=======
27+
=======
28+
48ed699a0da0282b7e12142648a322198a2f2af791df3fb49bbe3f7e41afadc4 /usr/local/bin/tox-bootstrapd
29+
>>>>>>> bdf460a3a (refactor: Rename `system_{memory,...}` to `os_{memory,...}`.)
30+
>>>>>>> 959219b01 (refactor: Rename `system_{memory,...}` to `os_{memory,...}`.)

0 commit comments

Comments
 (0)