From ea019601a712ba99e24c2b4dcad1944c38a90f2b Mon Sep 17 00:00:00 2001
From: andyjpaddle <jiangkaitao@baidu.com>
Date: Tue, 31 Aug 2021 12:19:11 +0000
Subject: [PATCH] fix conflic in program

---
 tools/program.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/program.py b/tools/program.py
index 2d3114f6..d6d47d04 100755
--- a/tools/program.py
+++ b/tools/program.py
@@ -402,11 +402,7 @@ def preprocess(is_train=False):
     alg = config['Architecture']['algorithm']
     assert alg in [
         'EAST', 'DB', 'SAST', 'Rosetta', 'CRNN', 'STARNet', 'RARE', 'SRN',
-<<<<<<< HEAD
-        'CLS', 'PGNet', 'Distillation', 'TableAttn', 'SAR'
-=======
-        'CLS', 'PGNet', 'Distillation', 'NRTR', 'TableAttn'
->>>>>>> 63ed5fcab30801626ecf55a89f5dc9faf79a16d2
+        'CLS', 'PGNet', 'Distillation', 'NRTR', 'TableAttn', 'SAR'
     ]
 
     device = 'gpu:{}'.format(dist.ParallelEnv().dev_id) if use_gpu else 'cpu'
-- 
GitLab