From a40cde2430e95dedb1fba27f3a034bb9b4ffc6e0 Mon Sep 17 00:00:00 2001
From: Fernando Herrero <fherrero@iri.upc.edu>
Date: Fri, 3 May 2019 10:29:36 +0200
Subject: [PATCH] Update battery_management.tex
---
procedures/battery_management/battery_management.tex | 4 ----
1 file changed, 4 deletions(-)
diff --git a/procedures/battery_management/battery_management.tex b/procedures/battery_management/battery_management.tex
index 47bd321..170736a 100644
--- a/procedures/battery_management/battery_management.tex
+++ b/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}
--
GitLab