QuecPython
diff --git a/‎thonnycontrib/quecpython/backend/__init__.py
Copy file name to clipboard
-31Lines changed: 0 additions & 31 deletions b/‎thonnycontrib/quecpython/backend/__init__.py
Copy file name to clipboard
-31Lines changed: 0 additions & 31 deletions
@@ -1,31 +0,0 @@
-<<<<<<< HEAD
-=======
-# Copyright (c) Quectel Wireless Solution, Co., Ltd.All Rights Reserved.
-#  
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#  
-#     http://www.apache.org/licenses/LICENSE-2.0
-#  
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-from thonny.plugins.quecpython.backend.mp_front import (
-    BareMetalQuecPythonConfigPage,
-    BareMetalQuecPythonProxy,
-    GenericBareMetalQuecPythonConfigPage,
-    GenericBareMetalQuecPythonProxy,
-    LocalQuecPythonConfigPage,
-    LocalQuecPythonProxy,
-    QuecPythonProxy,
-    SshQuecPythonConfigPage,
-    SshQuecPythonProxy,
-    add_quecpython_backend,
-    list_serial_ports,
-)
->>>>>>> 17b1ed54a61be0024c949d65f9f6c70df47075e0