diff options
| author | Dennis Rodriguez <dennis1088@gmail.com> | 2009-12-19 19:59:25 (GMT) |
|---|---|---|
| committer | Dennis Rodriguez <dennis1088@gmail.com> | 2009-12-19 19:59:25 (GMT) |
| commit | 10f359fa95e95a7f87a5e0b4064aebc354e4c169 (patch) | |
| tree | b1051715809d227289acc4a10375a937a75da7fe | |
| parent | f5ed1dcdfef74464000631e92bdb7ae9c5b5e447 (diff) | |
| parent | b10b7d84f0308003f531414d741f306c0ac1bdbb (diff) | |
Fixed merge conflict by hand
Conflicts:
names
| -rw-r--r-- | names | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,2 +1,3 @@ Dennis Rodriguez Dennis Rodriguez 2 +Yasser Hernandez |