From 75801d83c8302b48051d413490e6ce2a0b8ff01f Mon Sep 17 00:00:00 2001
From: Alexander Kabui
Date: Sun, 20 Jun 2021 09:09:01 +0300
Subject: fix conflict

---
 guix.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix.scm b/guix.scm
index d41600d..104dc51 100644
--- a/guix.scm
+++ b/guix.scm
@@ -87,8 +87,10 @@
                        ("r" ,r)
                        ; ("r-ctl" ,r-ctl)
                        ("r-qtl" ,r-qtl)
-                       ("r-testthat" ,r-testthat)
                        ("r-optparse" ,r-optparse)
+                       ("r-stringi" ,r-stringi)
+                       ("r-stringr" ,r-stringr)
+                       ("r-testthat" ,r-testthat)
                        ("r-wgcna" ,r-wgcna)
                        ))
   (build-system python-build-system)
-- 
cgit v1.2.3