diff --git a/app/src/main/java/com/zww/sample/Te.kt b/app/src/main/java/com/zww/sample/Te.kt index ec1ba79f..0641bb27 100644 --- a/app/src/main/java/com/zww/sample/Te.kt +++ b/app/src/main/java/com/zww/sample/Te.kt @@ -6,13 +6,3 @@ package com.zww.sample * 文件描述: */ data class Tl(val tl1:StrictMath,val tl2:LinkageError) -<<<<<<< HEAD - -123 -data class T10086(val is10086True:StrictMath,val tl2:LinkageError) -data class T10086(val is10086True:StrictMath,val tl2:LinkageError) -data class T10086(val is10086True:StrictMath,val tl2:LinkageError) -data class T10086(val is10086True:StrictMath,val tl2:LinkageError) -======= ->>>>>>> a870ffef0fab8c2201da840280ce5383bfa139b6 -data class T10086(val is10086True:StrictMath,val tl2:LinkageError)