From 12f3a137d3820297f7f5ac344a3adede75a06006 Mon Sep 17 00:00:00 2001
From: developer8 <support@d-logic.rs>
Date: Sat, 9 Jul 2016 07:16:58 +0000
Subject: [PATCH] - the smaller correction of code

git-svn-id: svn://192.168.1.162/sw_open/ais_readers/python/examples/shell/trunk@80 0228885a-6ad7-41a9-bcf9-d0ec016d0fc8
---
 readers.ini | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/readers.ini b/readers.ini
index c39f163..7a18e59 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
-- 
GitLab