lite: robotframework 5.0.1, robotkernel >= 1.6rc1

datakurre · datakurre · commit 04b96f7ea220 · 2022-05-17T08:58:19.000+03:00
diff --git a/lite/jupyterlite-robotkernel/py_src/jupyterlite_robotkernel/addons/wheels.json b/lite/jupyterlite-robotkernel/py_src/jupyterlite_robotkernel/addons/wheels.json
@@ -54,4 +54,8 @@
     "https://files.pythonhosted.org/packages/py3/t/terminado/terminado-0.15.0-py3-none-any.whl",
     "https://files.pythonhosted.org/packages/py3/t/tinycss2/tinycss2-1.1.1-py3-none-any.whl",
     "https://files.pythonhosted.org/packages/py3/t/traitlets/traitlets-5.2.1.post0-py3-none-any.whl"
+<<<<<<< HEAD
 ]
+=======
+]
+>>>>>>> efde4d0 (lite: robotframework 5.0.1, robotkernel >= 1.6rc1)

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,8 @@`
`54`	`54`	`"https://files.pythonhosted.org/packages/py3/t/terminado/terminado-0.15.0-py3-none-any.whl",`
`55`	`55`	`"https://files.pythonhosted.org/packages/py3/t/tinycss2/tinycss2-1.1.1-py3-none-any.whl",`
`56`	`56`	`"https://files.pythonhosted.org/packages/py3/t/traitlets/traitlets-5.2.1.post0-py3-none-any.whl"`
	`57`	`+<<<<<<< HEAD`
`57`	`58`	`]`
	`59`	`+=======`
	`60`	`+]`
	`61`	`+>>>>>>> efde4d0 (lite: robotframework 5.0.1, robotkernel >= 1.6rc1)`