Commit 9c804506 authored by Nicholas Shindler's avatar Nicholas Shindler
Browse files

Merge branch 'master' into 'dev'

# Conflicts:
parents b64579f1 fb888632
......@@ -49,4 +49,4 @@ this is for harvest vehicle robots, property of a private company and therefore
|--- *setter*: parent class for sending data to the robots
|--- *mp*: class for the midprobe client connection
|--- *utils*: general utility functions
\ No newline at end of file
Markdown is supported
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