Update battery_management.tex

procedures/battery_management/battery_management.tex

@@ -2,13 +2,9 @@
 \usepackage[english]{babel}
 \usepackage[utf8x]{inputenc}
 \usepackage{graphicx}
-<<<<<<< HEAD
 \usepackage{caption}
 \usepackage{subcaption}
-\graphicspath{ {./images/} }
-=======
 \graphicspath{ {./images/} {../common_images/} }
->>>>>>> 363093aa75348c1116656a192cf4814904c11599
 \usepackage{wrapfig}
 \usepackage{multirow}