jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

odroidc1, odroidc2: fix some merge leftovers

Browse Source
This commit is contained in:
Calin Crisan 2017-03-07 20:15:30 +02:00
parent ba4da2b295
commit 71078358a5
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/odroidc1/overlay/etc/os.conf
View File

@ -6,10 +6,6 @@ os_wlan="wlan0"
os_ppp="ppp0" os_ppp="ppp0"
os_networkless="false" os_networkless="false"
os_firmware_method="github" os_firmware_method="github"
<<<<<<< HEAD
os_firmware_repo="ccrisan/motioneyeos" os_firmware_repo="ccrisan/motioneyeos"
=======
os_firmware_repo="ccrisan/thingos"
>>>>>>> thingos/master
os_firmware_username="" os_firmware_username=""
os_firmware_password="" os_firmware_password=""

4
board/odroidc2/overlay/etc/os.conf
View File

@ -6,10 +6,6 @@ os_wlan="wlan0"
os_ppp="ppp0" os_ppp="ppp0"
os_networkless="false" os_networkless="false"
os_firmware_method="github" os_firmware_method="github"
<<<<<<< HEAD
os_firmware_repo="ccrisan/motioneyeos" os_firmware_repo="ccrisan/motioneyeos"
=======
os_firmware_repo="ccrisan/thingos"
>>>>>>> thingos/master
os_firmware_username="" os_firmware_username=""
os_firmware_password="" os_firmware_password=""