Skip to content

Commit 474e924

Browse files
JFSolutionJosef-MrBeam
authored andcommitted
SW-650 create update script for netconnectd plugin (#2)
1 parent 183f025 commit 474e924

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

octoprint_netconnectd/scripts/update_script.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,11 @@ def loadPluginTarget(archive, folder):
392392
plugin_extracted_path_folder = os.path.join(
393393
plugin_extracted_path,
394394
"{repo_name}-{target}".format(
395+
<<<<<<< HEAD
395396
repo_name=REPO_NAME, target=re.sub(r"^v", "", filename.split(".zip")[0])
397+
=======
398+
repo_name=REPO_NAME, target=filename.split(".zip")[0]
399+
>>>>>>> 810f55e (SW-650 create update script for netconnectd plugin (#2))
396400
),
397401
)
398402
try:

0 commit comments

Comments
 (0)