search

genielabs / HomeGenie

HomeGenie, the programmable automation intelligence
https://homegenie.it
GNU General Public License v3.0
393 stars 155 forks source link

Add language support in differents widgets schedule system #105

Closed dmayard closed 9 years ago

dmayard commented 9 years ago

Hi Gene, Can you add this merge to your master git. I need to pull it for update and I am 'cauto' with conflict merge Cheers Dani

genemars commented 9 years ago

Hi dani, github says that this cannot be automatically merged. Resolve conflicts first.

dmayard commented 9 years ago

Hi Gene, Can you add this merge to your master. When we pull a commit we have often conflicts. Perhaps I don't use the good way. I am using command line. And You ? Have you an other way ? Cheers Dani

genemars commented 9 years ago

I use both command line or rabbit csv