fix conflict

2013-07-03 16:30:38 -07:00
parent 1f4b0872ef 1a9af53840
commit 23c51c6358
1 changed files with 2 additions and 0 deletions
@@ -130,3 +130,5 @@ Summary
 -------

 Congratulations! You built a batch job that ingested data from a spreadsheet, processed it, and wrote it to a database.
+
+[zip]: https://github.com/springframework-meta/gs-batch-processing/archive/master.zip