Adding more information for Carlos Araya

This commit is contained in:
Carlos 2012-05-10 21:15:26 -07:00
parent cfe0d541c9
commit d97fcb1011

View file

@ -1,5 +1,11 @@
{
"copyright": "Carlos Araya",
<<<<<<< HEAD
"url": "http://rivendellweb.net/work/",
"theme": "double-windsor"
}
}
=======
"url": "http://rivendellweb.net",
"theme": "double-windsor"
}
>>>>>>> Adding more information for Carlos Araya