Fix merge conflict.

rapidsai · Nov 16, 2024 · e60245d · e60245d
1 parent e4e19a4
commit e60245d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/build.sh b/build.sh
@@ -29,10 +29,6 @@ HELP="$0 [<target> ...] [<flag> ...] [--cmake-args=\"<args>\"] [--cache-tool=<to
    docs             - build the documentation
    tests            - build the tests
    bench-prims      - build micro-benchmarks for primitives
-<<<<<<< HEAD
-=======
-   template         - build the example RAFT application template
->>>>>>> branch-24.12
 
  and <flag> is:
    -v                          - verbose build mode