[tor-commits] [donate-static/master] Fix leftover conflict in .gitlab-ci.yml

[kez@xxxxxxxxxxxxxx]

commit 115218c8314a1e58ead52c43c95df1ad6206d0b6
Author: kez <kez@xxxxxxxxxxxxxx>
Date:   Mon Oct 25 11:34:14 2021 -0700

    Fix leftover conflict in .gitlab-ci.yml
---
 .gitlab-ci.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7194027c..0abc34f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,4 @@
-<<<<<<< HEAD
 image: node:current-bullseye
-=======
-image: debian:buster-slim
-
->>>>>>> e809cc4a6ae50f8734fe7863b8c1a336664fe522
 
 # This template should be usable on any system that's based on apt.
 # taken from tor gitlabci

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits