diff options
Diffstat (limited to 'gn/packages')
| -rw-r--r-- | gn/packages/python24.scm | 3 |
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) |