Skip to content

Commit f1bdf18

Browse files
committed
fix merge code conflict
1 parent 3ed9929 commit f1bdf18

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

sapi/src/template/make.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@
376376
xattr -cr <?= $this->phpSrcDir ?>/sapi/cli/php
377377
otool -L <?= $this->phpSrcDir ?>/sapi/cli/php
378378
<?php else : ?>
379-
{ ldd ldd <?= $this->phpSrcDir ?>/sapi/cli/php ; } || { echo $? ; }
379+
{ ldd <?= $this->phpSrcDir ?>/sapi/cli/php ; } || { echo $? ; }
380380
file <?= $this->phpSrcDir ?>/sapi/cli/php
381381
readelf -h <?= $this->phpSrcDir ?>/sapi/cli/php
382382
{ readelf -l <?= $this->phpSrcDir ?>/sapi/cli/php ; } || { echo $? ; }

0 commit comments

Comments
 (0)