From 76a0a93d94603fe423b7e74cd9fdb7dd08371bc6 Mon Sep 17 00:00:00 2001
From: Stefan Bienert <stefan.bienert@unibas.ch>
Date: Sun, 26 Jun 2022 22:29:44 +0200
Subject: [PATCH] Add description

---
 translate2modelcif.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/translate2modelcif.py b/translate2modelcif.py
index b092c6e..e685cb6 100644
--- a/translate2modelcif.py
+++ b/translate2modelcif.py
@@ -251,6 +251,7 @@ def _get_protocol_steps_and_software(cnfg_file):
     # Must refer to existing data, so we try keywords
     step["output"] = "model"
     # get software
+<<<<<<< HEAD
     step["software"] = [
         {
             "name": "ColabFold",
-- 
GitLab