Kilos | hi tsega | 05:37 |
---|---|---|
tsega | Hello Kilos, I read something about static sites and i wanted to share the link, http://www.sitepoint.com/free-static-sites-middleman-github/?utm_content=buffer3064d&utm_medium=social&utm_source=facebook.com&utm_campaign=buffer | 05:38 |
Kilos | ty tsega | 05:38 |
tsega | my pleasure | 05:39 |
Kilos | morning ongolaBoy | 06:39 |
Padroni | Mornign all | 06:44 |
Kilos | greetings | 06:44 |
Kilos | hi eebrah | 07:12 |
eebrah | hi Kilos | 07:14 |
Kilos | hi Neo31` | 09:27 |
Neo31` | hi Kilos | 09:29 |
Neo31` | :) | 09:29 |
Neo31` | how r u today | 09:29 |
Kilos | good ty and you / :D | 09:29 |
Kilos | ignore the / crooked fingers | 09:31 |
arnaudmez | Hello Guys | 13:28 |
Neo31` | hello world! | 16:15 |
Kilos | hi Neo31` | 16:15 |
Neo31` | :) | 16:17 |
Kilos | haha wearing your little topknot again i see | 16:19 |
superfly | Kilos: so what have you been messing up? | 18:42 |
Kilos | i merged the one market bad with the new one | 18:46 |
superfly | merged or copied? | 18:46 |
Kilos | actually copied everything except the conf files | 18:47 |
superfly | ah | 18:47 |
Kilos | then ran merge | 18:47 |
superfly | ai | 18:47 |
Kilos | what must i remove | 18:48 |
Kilos | i couldnt understand why i couldnt see it locally | 18:49 |
superfly | Kilos: two things: 1) do you still have the commands and stuff that you used? | 18:49 |
Kilos | yes | 18:49 |
superfly | 2) if you have a problem, ask before you do stuff | 18:49 |
superfly | you have access to "trunk" - the place where nothing should break | 18:50 |
Kilos | ok | 18:50 |
Kilos | i havent touched trunk | 18:50 |
superfly | if you committed anything to your local trunk, it would end up on launchpad | 18:50 |
Kilos | i made a new branch | 18:50 |
Kilos | twit | 18:50 |
Kilos | did everything in there | 18:50 |
Kilos | so trunk should still be clean | 18:53 |
superfly | Kilos: good thinking, well done | 18:56 |
stickyboy | Kilos++ | 18:57 |
Kilos | oh my | 18:57 |
stickyboy | Grrr Bitcoin. | 19:03 |
=== mounir_ is now known as orfix |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!