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:
commit
c00b581648
@ -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)
|
||||||
|
Loading…
Reference in New Issue
Block a user