Developing lightweight computation at the DSG edge
Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Quick Mesh Project
qMp firmware cooker
Commits
a3ce32f3
Commit
a3ce32f3
authored
Jan 03, 2018
by
Roger Pueyo Centelles
Browse files
Fix merge debris
parent
3552b3cf
Changes
1
Hide whitespace changes
Inline
Side-by-side
options.conf.local
View file @
a3ce32f3
<<<<<<< HEAD
release=Neumann
version=testing
lede_release=17.01.4
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment