From 3ea2795bf11625ed1794bf629cabcf4ec3ebfa04 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Sun, 18 Sep 2016 08:29:02 +0200 Subject: [PATCH] Fix merge error of AQUAI300 memory layout This removes the additional entry for AQUAI300, as it was done in "Fix the memory layout for the Aqualung i300." (1e22760f9102ac). Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- src/oceanic_atom2.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index 89741bc..b3ddce4 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -129,7 +129,6 @@ static const oceanic_common_version_t oceanic_default_version[] = { {"DATAMASK \0\0 512K"}, {"COMPMASK \0\0 512K"}, {"HOLLDG03 \0\0 512K"}, - {"AQUAI300 \0\0 512K"}, }; static const oceanic_common_version_t oceanic_proplus3_version[] = {