Fix poor conflict resolution in training slides

Felicity Chapman · Felicity Chapman · commit 37c78bf1ea77 · 2019-11-11T13:11:28.000Z
diff --git a/docs/language/ql-training/cpp/bad-overflow-guard.rst b/docs/language/ql-training/cpp/bad-overflow-guard.rst
@@ -3,7 +3,6 @@ Example: Bad overflow guard
 ===========================
 
 CodeQL for C/C++
-================
 
 .. rst-class:: setup
 
diff --git a/docs/language/ql-training/cpp/control-flow-cpp.rst b/docs/language/ql-training/cpp/control-flow-cpp.rst
@@ -3,7 +3,6 @@ Analyzing control flow
 ======================
 
 CodeQL for C/C++
-================
 
 .. Include information slides here
 
diff --git a/docs/language/ql-training/cpp/global-data-flow-cpp.rst b/docs/language/ql-training/cpp/global-data-flow-cpp.rst
@@ -3,7 +3,6 @@ Introduction to global data flow
 ================================
 
 CodeQL for C/C++
-================
    
 .. rst-class:: setup
 
diff --git a/docs/language/ql-training/cpp/intro-ql-cpp.rst b/docs/language/ql-training/cpp/intro-ql-cpp.rst
@@ -3,7 +3,6 @@ Introduction to variant analysis
 ================================
 
 CodeQL for C/C++
-================
 
 .. rst-class:: setup
 
diff --git a/docs/language/ql-training/cpp/program-representation-cpp.rst b/docs/language/ql-training/cpp/program-representation-cpp.rst
@@ -3,7 +3,6 @@ Program representation
 ======================
 
 CodeQL for C/C++
-================
 
 .. rst-class:: agenda
 
diff --git a/docs/language/ql-training/cpp/snprintf.rst b/docs/language/ql-training/cpp/snprintf.rst
@@ -3,7 +3,6 @@ Exercise: ``snprintf`` overflow
 ===============================
 
 CodeQL for C/C++
-================
 
 .. rst-class:: setup
 
diff --git a/docs/language/ql-training/java/global-data-flow-java.rst b/docs/language/ql-training/java/global-data-flow-java.rst
@@ -3,7 +3,6 @@ Introduction to global data flow
 ================================
 
 CodeQL for Java
-===============
 
 .. rst-class:: setup
 
diff --git a/docs/language/ql-training/java/intro-ql-java.rst b/docs/language/ql-training/java/intro-ql-java.rst
@@ -3,7 +3,6 @@ Introduction to variant analysis
 ================================
 
 CodeQL for Java
-===============
 
 .. rst-class:: setup
 
diff --git a/docs/language/ql-training/java/program-representation-java.rst b/docs/language/ql-training/java/program-representation-java.rst
@@ -3,7 +3,6 @@ Program representation
 ======================
 
 CodeQL for Java
-===============
 
 .. rst-class:: agenda
 
diff --git a/docs/language/ql-training/java/query-injection-java.rst b/docs/language/ql-training/java/query-injection-java.rst
@@ -3,7 +3,6 @@ Example: Query injection
 ========================
 
 CodeQL for Java
-===============
 
 .. rst-class:: setup
 
