diff options
author | aditya <bluenerd@protonmail.com> | 2023-08-10 12:32:35 +0530 |
---|---|---|
committer | aditya <bluenerd@protonmail.com> | 2023-08-10 12:32:35 +0530 |
commit | a9ff78b3f48dc9f81943c41531c4959ce7e2ae9d (patch) | |
tree | 49ee8c3c9148038f04112802265d928ef1aba428 /scripts/build-info.sh | |
parent | 2516af4cd61f509c995b4f78fdf123cba33f3509 (diff) | |
parent | 916a9acdd0a411426690400ebe2bb7ce840a6bba (diff) |
resolve merge conflict
Diffstat (limited to 'scripts/build-info.sh')
-rwxr-xr-x | scripts/build-info.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/build-info.sh b/scripts/build-info.sh index 507d7e1..ed0d6c5 100755 --- a/scripts/build-info.sh +++ b/scripts/build-info.sh @@ -16,7 +16,8 @@ fi echo "#ifndef BUILD_INFO_H" echo "#define BUILD_INFO_H" echo "" -echo "#define BUILD_NUMBER $BUILD_NUMBER" -echo "#define BUILD_COMMIT \"$BUILD_COMMIT\"" +echo "#define BUILD_NUMBER $BUILD_NUMBER" | tr -d '\n' +echo "" +echo "#define BUILD_COMMIT \"$BUILD_COMMIT\"" | tr -d '\n' echo "" echo "#endif // BUILD_INFO_H" |