testing git

2026-08-18 16:36:49 +02:00
parent 6abd7ea855
commit b70f3dfc57
1 changed files with 9 additions and 0 deletions
@@ -7,25 +7,34 @@
 # could be pip3 install --user meson
 # cd lines can be deleted with compile_in_sourcetree being true
 pbuild::configure() {
+<<<<<<< Updated upstream
 <<<<<<< HEAD
 =======
    cd "${SRC_DIR}"
 >>>>>>> fc35801 (use local meson, need to pip install meson > 0.60 at home folder)
+=======
+>>>>>>> Stashed changes
    ~/.local/bin/meson setup build --prefix="${PREFIX}"
 }

 pbuild::compile() {
+<<<<<<< Updated upstream
 <<<<<<< HEAD
 =======
    cd "${SRC_DIR}"
 >>>>>>> fc35801 (use local meson, need to pip install meson > 0.60 at home folder)
+=======
+>>>>>>> Stashed changes
    ~/.local/bin/meson compile -C build
 }

 pbuild::install() {
+<<<<<<< Updated upstream
 <<<<<<< HEAD
 =======
    cd "${SRC_DIR}"
 >>>>>>> fc35801 (use local meson, need to pip install meson > 0.60 at home folder)
+=======
+>>>>>>> Stashed changes
    ~/.local/bin/meson install -C build
 }