fix merge conflict with bestpractices/querying 49/head
authorLisa Owen <lowen@pivotal.io>
Tue, 1 Nov 2016 23:05:30 +0000 (16:05 -0700)
committerLisa Owen <lowen@pivotal.io>
Tue, 1 Nov 2016 23:05:30 +0000 (16:05 -0700)
commitab916122987d3430606abeb3627700893d189e77
tree1be4b8fd3ef15f1ddc2bc7ce60465c794aa9b9f4
parentaf50fc8088f12f4dd08faf180532355902790b89
parentb0ca8aa5a4cb6f561cdc371da878b78622cb3b16
fix merge conflict with bestpractices/querying
bestpractices/querying_data_bestpractices.html.md.erb