Permalink
Browse files

Everything again ok after url corrections

  • Loading branch information...
1 parent 64f3a40 commit 325b5a5df12ec3a9aab0b7f4f58bdba12d95e6f0 @voylinux voylinux committed Dec 23, 2013
Showing with 18 additions and 18 deletions.
  1. +5 −13 README.md
  2. +13 −5 README_es.md → README_en.md
View
@@ -1,11 +1,6 @@
-The MongoDB Community Kit
+El Kit de la Comunidad de Mongodb
====================================
-<<<<<<< HEAD
-Hello and welcome to the MongoDB Community Kit. This kit is designed to give guidance to those interested in
-participating in the MongoDB community. Included are directives meant to help you, as a user and community member, assist
-others in achieving success in our growing open-source community.
-=======
Hola y bienvenido al Kit de la Comunidad de Mongodb. Está diseñado para proporcionar una
guía a aquellos interesados en participar en la comunidad de Mongodb. Incluye
las directivas destinadas a servirte de ayuda, como usuario y como miembro de la
@@ -17,18 +12,15 @@ Tabla de contenidos:
* [Carta al promotor: Bienvenido al Kit de Desarrollador Promotor](Una%20carta%20al%20promotor.md)
* [Contribuir a la documentación](Contribuir%20a%20la%20documentaci%C3%B3n.md)
* [Contribuir al código](Contribuir%20al%20codigo.md)
->>>>>>> 17913a5fcd6642e4444f7dfcd532ff11e548bb67
-Table of Contents:
-* [Letter to the Advocate: Welcome to the Developer Advocacy Kit](A%20Letter%20to%20the%20Advocate.md)
-* [Contributing to the Docs](Contributing%20to%20the%20Docs.md)
-* [Contributing Code](Contributing%20Code.md)
* [Blogging](Blogging.md)
* [Blogging Best Practices](Blogging%20Best%20Practices.md)
* [Starting a MongoDB User Group](MongoDB%20User%20Groups.md)
* [Speaking about MongoDB](Speaking%20About%20MongoDB.md)
* [Advocate for MongoDB at Your Company](At%20Your%20Company.md)
-###License
-This package is released under the [Creative Commons licence CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/)
+###Licencia
+Este paquete se distribuye bajo licencia [Creative Commons licence CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/)
+
+*Este contenido es una traducción de [README](README_en.md)
@@ -1,6 +1,11 @@
-El Kit de la Comunidad de Mongodb
+The MongoDB Community Kit
====================================
+<<<<<<< HEAD
+Hello and welcome to the MongoDB Community Kit. This kit is designed to give guidance to those interested in
+participating in the MongoDB community. Included are directives meant to help you, as a user and community member, assist
+others in achieving success in our growing open-source community.
+=======
Hola y bienvenido al Kit de la Comunidad de Mongodb. Está diseñado para proporcionar una
guía a aquellos interesados en participar en la comunidad de Mongodb. Incluye
las directivas destinadas a servirte de ayuda, como usuario y como miembro de la
@@ -12,15 +17,18 @@ Tabla de contenidos:
* [Carta al promotor: Bienvenido al Kit de Desarrollador Promotor](Una%20carta%20al%20promotor.md)
* [Contribuir a la documentación](Contribuir%20a%20la%20documentaci%C3%B3n.md)
* [Contribuir al código](Contribuir%20al%20codigo.md)
+>>>>>>> 17913a5fcd6642e4444f7dfcd532ff11e548bb67
+Table of Contents:
+* [Letter to the Advocate: Welcome to the Developer Advocacy Kit](A%20Letter%20to%20the%20Advocate.md)
+* [Contributing to the Docs](Contributing%20to%20the%20Docs.md)
+* [Contributing Code](Contributing%20Code.md)
* [Blogging](Blogging.md)
* [Blogging Best Practices](Blogging%20Best%20Practices.md)
* [Starting a MongoDB User Group](MongoDB%20User%20Groups.md)
* [Speaking about MongoDB](Speaking%20About%20MongoDB.md)
* [Advocate for MongoDB at Your Company](At%20Your%20Company.md)
-###Licencia
-Este paquete se distribuye bajo licencia [Creative Commons licence CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/)
-
-*Este contenido es una traducción de [README](README_en.md)
+###License
+This package is released under the [Creative Commons licence CC BY-NC-SA 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/)

0 comments on commit 325b5a5

Please sign in to comment.