diff options
| author | Yuri Yasser González Parajón <yurigonzalezni@gmail.com> | 2010-08-27 15:35:41 (GMT) |
|---|---|---|
| committer | Yuri Yasser González Parajón <yurigonzalezni@gmail.com> | 2010-08-27 15:35:41 (GMT) |
| commit | 0cbc7f056d74784f45e5b0cb86b2868f17125204 (patch) | |
| tree | 70a118c5894dd17f4405bae2bb9bd1d931601db5 | |
| parent | 8b727f9385b7e81d585c54775859a91f47d2e2b4 (diff) | |
"Modificando Respuesta de Estado"
| -rw-r--r-- | nivel.txt | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1 +1,5 @@ -3
\ No newline at end of file +<<<<<<< Updated upstream +3 +======= +2 +>>>>>>> Stashed changes |