aboutsummaryrefslogtreecommitdiff
path: root/gn/packages
diff options
context:
space:
mode:
authorPjotr Prins2022-12-11 17:54:10 +0000
committerPjotr Prins2022-12-11 17:54:10 +0000
commitc73cc82d43e396c7f4a20391be497490fe859082 (patch)
tree9ace1ad4fd10929b157cd2a10d984f74e2a63255 /gn/packages
parent7c0d24a788dcbe7f8c8efda3d830ae265311fc6d (diff)
downloadguix-bioinformatics-c73cc82d43e396c7f4a20391be497490fe859082.tar.gz
forward port gn1
Diffstat (limited to 'gn/packages')
-rw-r--r--gn/packages/python24.scm3
1 files changed, 0 insertions, 3 deletions
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)