Skip to content

Commit 1a447b9

Browse files
committed
update backend
1 parent 0b7b770 commit 1a447b9

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed
Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +0,0 @@
1-
<<<<<<< HEAD
2-
=======
3-
# Copyright (c) Quectel Wireless Solution, Co., Ltd.All Rights Reserved.
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License");
6-
# you may not use this file except in compliance with the License.
7-
# You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing, software
12-
# distributed under the License is distributed on an "AS IS" BASIS,
13-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
# See the License for the specific language governing permissions and
15-
# limitations under the License.
16-
17-
18-
from thonny.plugins.quecpython.backend.mp_front import (
19-
BareMetalQuecPythonConfigPage,
20-
BareMetalQuecPythonProxy,
21-
GenericBareMetalQuecPythonConfigPage,
22-
GenericBareMetalQuecPythonProxy,
23-
LocalQuecPythonConfigPage,
24-
LocalQuecPythonProxy,
25-
QuecPythonProxy,
26-
SshQuecPythonConfigPage,
27-
SshQuecPythonProxy,
28-
add_quecpython_backend,
29-
list_serial_ports,
30-
)
31-
>>>>>>> 17b1ed54a61be0024c949d65f9f6c70df47075e0

0 commit comments

Comments
 (0)