hai, git stuff in source code

57 views
Skip to first unread message

Manuel Moraga

unread,
Jan 28, 2013, 8:59:29 AM1/28/13
to lci-g...@googlegroups.com
HAI
It seems you have left some git stuff in the latest git source from a recent merge :)
Line 28 of install.py has <<<<<<<< HEAD left in it for example

Justin Meza

unread,
Jan 28, 2013, 9:12:35 AM1/28/13
to lci-g...@googlegroups.com
Ah, thanks for pointing that out!  I forgot to merge install.py.  I'll double-check the other files as well.

- Justin


--
You received this message because you are subscribed to the Google Groups "lci-general" group.
To unsubscribe from this group, send email to lci-general...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
 
 

Manuel Moraga

unread,
Jan 28, 2013, 9:17:31 AM1/28/13
to lci-g...@googlegroups.com
On Mon, Jan 28, 2013 at 3:12 PM, Justin Meza <justi...@gmail.com> wrote:
Ah, thanks for pointing that out!  I forgot to merge install.py.  I'll double-check the other files as well.

- Justin

--
You received this message because you are subscribed to the Google Groups "lci-general" group.
To unsubscribe from this group, send email to lci-general...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
 
 
No problem! I've made that error myself a million times so I'm getting used to it :)
Reply all
Reply to author
Forward
0 new messages