fixed extra lines

Author: alexyixuanxu

src/data/en.yml

@@ -200,17 +200,14 @@ learn:
   3d-webgl: "Developing advanced graphics applications in p5.js using WEBGL mode."
   color-title: "Color"
   color: "An introduction to digital color."
-<<<<<<< HEAD
   coordinate-system-and-shapes-title: "Coordinate System and Shapes"
   coordinate-system-and-shapes: "Drawing simple shapes and using the coordinate system."
   interactivity-title: "Interactivity"
   interactivity: "Introduction to interactivity with the mouse and keyboard."
   program-flow-title: "Program Flow"
   program-flow: "Introduction to controlling program flow in p5.js."
-=======
   curves-title: "Curves"
   curves: "An introduction to the three types of curves in p5.js: arcs, spline curves, and Bézier curves."
->>>>>>> 667d74552a75c502e89461522b0be6fd2647f3f1
   becoming-a-better-programmer-title: "Becoming a better programmer"
   debugging-title: "Debugging"
   debugging: "Field guide to debugging for everyone."

src/data/es.yml

@@ -201,7 +201,6 @@ learn:
   beyond-the-canvas: "Creación y manipulación de elementos en la página, más allá del lienzo."
   3d-webgl-title: "3D/WebGL"
   3d-webgl: "Desarrollo de aplicaciones con gráficas avanzadas en p5.js usando el modo WEBGL."
-<<<<<<< HEAD
   color-title: "Color"
   color: "Una introducción al color digital."
   coordinate-system-and-shapes-title: "Coordinate System and Shapes"
@@ -210,12 +209,10 @@ learn:
   interactivity: "Introduction to interactivity with the mouse and keyboard."
   program-flow-title: "Program Flow"
   program-flow: "Introduction to controlling program flow in p5.js."
-=======
   color-title: Color
   color: Una introducción al color digital.
   curves-title: "Curvas"
   curves: "Una introducción a los tres tipos de curvas en p5.js: arcos, curvas spline y curvas Bézier."
->>>>>>> 667d74552a75c502e89461522b0be6fd2647f3f1
   becoming-a-better-programmer-title: "Cómo programar mejor"
   debugging-title: "Depurar"
   debugging: "Guía de cómo depurar tu código para todo público."

src/data/zh-Hans.yml

@@ -200,17 +200,14 @@ learn:
   3d-webgl: "使用 p5.js WebGL 模式制作高级图形程式。"
   color-title: "颜色"
   color: "数码颜色的简介。"
-<<<<<<< HEAD
   coordinate-system-and-shapes-title: "坐标系统与图形"
   coordinate-system-and-shapes: "利用坐标系统绘制简单图形。"
   interactivity-title: "交互性"
   interactivity: "鼠标与键盘的交互简介。"
   program-flow-title: "程序流程"
   program-flow: "p5.js 控制程序流程简介。"
-=======
   curves-title: "曲线"
   curves: "介绍 p5.js 中的三种曲线：弧形，样条曲线和 Bézier 曲线。"
->>>>>>> 667d74552a75c502e89461522b0be6fd2647f3f1
   becoming-a-better-programmer-title: "成为更好的程式设计师"
   debugging-title: "调试"
   debugging: "调试程序的简介。"

src/templates/pages/learn/index.hbs

@@ -162,8 +162,6 @@ slug: learn/
         <p>{{#i18n "color"}}{{/i18n}}</p>
       </div>
 
-<<<<<<< HEAD
-
       <div class="right-column">
         <a class="nounderline" href="coordinate-system-and-shapes.html">
           <div class="label">
@@ -176,9 +174,9 @@ slug: learn/
         <p>{{#i18n "coordinate-system-and-shapes"}}{{/i18n}}</p>
       </div>
 
-      
-=======
-      <div class="right-column">
+      <div class="spacer"></div>
+
+      <div class="left-column">
         <a class="nounderline" href="curves.html">
           <div class="label">
             <img src="{{assets}}/img/learn/lib_placeholder.jpg">
@@ -190,11 +188,8 @@ slug: learn/
         <p>{{#i18n "curves"}}{{/i18n}}</p>
       </div>
 
->>>>>>> 667d74552a75c502e89461522b0be6fd2647f3f1
-      <div class="spacer"></div>
 
-
-      <div class="left-column">
+      <div class="right-column">
         <a class="nounderline" href="interactivity.html">
           <div class="label">
             <img src="{{assets}}/img/learn/lib_placeholder.jpg">
@@ -206,8 +201,9 @@ slug: learn/
         <p>{{#i18n "interactivity"}}{{/i18n}}</p>
       </div>
 
+      <div class="spacer"></div>
 
-      <div class="right-column">
+      <div class="left-column">
         <a class="nounderline" href="program-flow.html">
           <div class="label">
             <img src="{{assets}}/img/learn/lib_placeholder.jpg">