2
0
mirror of https://github.com/frappe/bench.git synced 2024-11-13 16:56:33 +00:00

Fixed merge conflicts

This commit is contained in:
Achilles Rasquinha 2018-02-05 18:45:50 +05:30
commit c00b581648

View File

@ -26,7 +26,6 @@ def print_bench_version(ctx, param, value):
def bench_command(bench_path='.'): def bench_command(bench_path='.'):
"""Bench manager for Frappe""" """Bench manager for Frappe"""
import bench import bench
from bench.app import get_current_frappe_version
from bench.utils import setup_logging from bench.utils import setup_logging
bench.set_frappe_version(bench_path=bench_path) bench.set_frappe_version(bench_path=bench_path)