fix conflicts

2020-03-06 11:31:19 +01:00
parent c0d9dd3ba9
commit ff648221bd
5 changed files with 174 additions and 131 deletions
--- a/src/transformers/modeling_bart.py
+++ b/src/transformers/modeling_bart.py
@@ -16,7 +16,6 @@
 import logging
 import math
 import random
-import ipdb
 from typing import Dict, List, Optional, Tuple

 import torch