From 61bcbdd9f3986f073ccdf4f7701d4814ca6a1af3 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 15 Jun 2022 13:46:32 +0800 Subject: [PATCH] Update Te.kt --- app/src/main/java/com/zww/sample/Te.kt | 10 ---------- 1 file changed, 10 deletions(-) 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)