arreglando conflictos

alu0100600582 · Nov 25, 2014 · 7f712b4 · 7f712b4
2 parents ba31ad6 + 04b0448
commit 7f712b4
Show file tree

Hide file tree

Showing 3 changed files with 379 additions and 59 deletions.
diff --git a/.c9/metadata/tab0 b/.c9/metadata/tab0
@@ -0,0 +1 @@
+{"filter":false,"title":"bash - \"alu0100600582-pract8_lpp-1107645\"","tooltip":"bash - \"alu0100600582-pract8_lpp-1107645\"","undoManager":{"mark":0,"position":-1,"stack":[]},"terminal":{"id":"alu0100600582@pract8_lpp_750","cwd":"","width":1008,"height":281,"scrollTop":9044},"timestamp":1416478439722,"hash":"da39a3ee5e6b4b0d3255bfef95601890afd80709"}