Commit 935a6ab3 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing ASN compilation

parents c010c507 70149cc5
Loading
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -697,7 +697,11 @@ WlanLocationAttributes ::= SEQUENCE

CPEProvidedLocation ::= SEQUENCE
{
<<<<<<< HEAD
    wGS84CoordinateDecimal        [0] Common-Parameters.WGS84CoordinateDecimal OPTIONAL,
=======
    wGS84CoordinateDecimal        [1] TS103280.WGS84CoordinateDecimal OPTIONAL,
>>>>>>> 70149cc568d8dd2ea282faeaad95a2876cac3f77
    ...
}