From b70f3dfc57abc520437e7acaff795249a9b1fdf2 Mon Sep 17 00:00:00 2001
From: Emma Victoria Beale <beale_e@ra-l-005.psi.ch>
Date: Tue, 18 Aug 2026 16:36:49 +0200
Subject: [PATCH] testing git

---
 crystfel/build | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/crystfel/build b/crystfel/build
index 0512977..848afcf 100755
--- a/crystfel/build
+++ b/crystfel/build
@@ -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
 }