mirror of
https://github.com/JoelBender/bacpypes
synced 2025-09-28 22:15:23 +08:00
missed a conflict
This commit is contained in:
parent
5eb4f820be
commit
725ea476b8
|
@ -9,11 +9,7 @@ Test Primitive Data Date
|
|||
import unittest
|
||||
|
||||
from bacpypes.debugging import bacpypes_debugging, ModuleLogger, xtob
|
||||
<<<<<<< HEAD
|
||||
from bacpypes.primitivedata import Date, Tag
|
||||
=======
|
||||
from bacpypes.primitivedata import Date, Tag, DecodingError
|
||||
>>>>>>> stage
|
||||
|
||||
# some debugging
|
||||
_debug = 0
|
||||
|
|
Loading…
Reference in New Issue
Block a user