diff --git a/readers.ini b/readers.ini index c39f1633ac91c31fcc19d4aafdcfc1fb3e56bbcc..7a18e59b9426d293f24b23bcbb6144348eac129b 100644 --- a/readers.ini +++ b/readers.ini @@ -16,12 +16,6 @@ #DL_AIS_BASE_HD_SDK:0 DL_AIS_BASE_HD_SDK:1 -<<<<<<< .mine DL_AIS_BASE_HD_SDK:3 -||||||| .r57 -DL_AIS_BASE_HD_SDK:15======= - -DL_AIS_BASE_HD_SDK:3 ->>>>>>> .r58