From c73cc82d43e396c7f4a20391be497490fe859082 Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Sun, 11 Dec 2022 17:54:10 +0000
Subject: forward port gn1

---
 gn/packages/python24.scm | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gn/packages/python24.scm')

diff --git a/gn/packages/python24.scm b/gn/packages/python24.scm
index 4a26e1f..4c92dd1 100644
--- a/gn/packages/python24.scm
+++ b/gn/packages/python24.scm
@@ -11,11 +11,8 @@
   #:use-module (past packages python)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages databases)
-<<<<<<< HEAD
-=======
   #:use-module (gnu packages elf)
   #:use-module (gnu packages gcc)
->>>>>>> 0684b02... gn: Use known good binary version of direct.so for genenetwork1
   #:use-module (gnu packages maths)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages tls)
-- 
cgit v1.2.3