Skip to content
Snippets Groups Projects
Commit 4b923193 authored by mehtank's avatar mehtank
Browse files

Fix merge

parent a3a4f53e
No related merge requests found
"""
<<<<<<<< HEAD:scr2022/__init__.py
roco plugin: SCR2022 designs
Robot designs created at the SCR2022 origami robot workshop
========
roco plugin: sea creature designs
Library for making sea creatures using roco
>>>>>>>> sea/main:seacreatures/__init__.py
"""
__author__ = 'UCLA LEMUR'
__credits__ = 'The Laboratory for Embedded Machines and Ubiquitous Robots'
<<<<<<<< HEAD:scr2022/__init__.py
__plugin_name__ = 'scr2022'
__description__ = 'Robot Compiler: design plugin for ' + __plugin_name__
__url__ = 'https://github.com/mehtank/roco-scr2022'
========
__plugin_name__ = 'seacreatures'
__description__ = 'Robot Compiler: design plugin for ' + __plugin_name__
__url__ = 'https://git.uclalemur.com/mehtank/roco-seacreatures'
>>>>>>>> sea/main:seacreatures/__init__.py
from ._version import __version__
del _version
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment