diff options
| author | Paul Bowsher <paul.bowsher@gmail.com> | 2011-08-15 23:27:27 +0100 |
|---|---|---|
| committer | Paul Bowsher <paul.bowsher@gmail.com> | 2011-08-15 23:27:27 +0100 |
| commit | e239c6ec11740d1daf22f1bdedf7f4b072edd667 (patch) | |
| tree | 32fb94e3f5e73f04f894842a07de709265f2dc9f | |
| parent | 67bd9fc3a2221d077b25da6aff484c0432bd91a5 (diff) | |
| download | bundler-e239c6ec11740d1daf22f1bdedf7f4b072edd667.tar.gz | |
Fix conflict from revert of benchmark tool
| -rw-r--r-- | man/bundle.ronn | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/man/bundle.ronn b/man/bundle.ronn index 179ed8ca74..04f0463832 100644 --- a/man/bundle.ronn +++ b/man/bundle.ronn @@ -66,12 +66,6 @@ We divide `bundle` subcommands into primary commands and utilities. * `bundle viz(1)`: Generate a visual representation of your dependencies -<<<<<<< HEAD - -* `bundle benchmark(1)`: - Display the time taken for each each gem to be loaded into the environment -======= ->>>>>>> parent of e547c86... Add documentation for the benchmark CLI utility * `bundle init(1)`: Generate a simple `Gemfile`, placed in the current directory |