Fix merge conflicts

82a1169f · Bady · b9f2172e · c4b67cbb · 82a1169f · 82a1169f
Commit 82a1169f authored 4 years ago by Bady
--- a/index.html
+++ b/index.html
 <!DOCTYPE html>
 <html><head>
-	<meta name="generator" content="Hugo 0.78.2" />
+    <meta name="generator" content="Hugo 0.79.0" />
    <meta charset="utf-8">
    <meta http-equiv="x-ua-compatible" content="ie=edge">
    <title>Free Software Camp 2020</title>
@@ -8,7 +8,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <link rel="stylesheet" href='https://camp.fsf.org.in/css/style.css' type="text/css" media="screen" />
    <link rel="apple-touch-icon" href="/apple-touch-icon.png">
    <link rel="stylesheet" href="https://tools-static.wmflabs.org/cdnjs/ajax/libs/font-awesome/5.14.0/css/all.css" crossorigin="anonymous" />
 </head>
 <body>

--- a/sched/index.html
+++ b/sched/index.html
@@ -120,7 +120,7 @@ Learners choose a way forward by exploring and identifying ideas that interests
 <tr>
 <th scope="row">December 3- December 14</th>
 <td>
-Learners finalize one/two proposals for working on free software project(s) with mentors. Proposals should be submitted before 23:59 on December 10.
+Learners finalize one/two proposals for working on free software project(s) with mentors. Proposals should be submitted before 23:59 on December 14.
 </td>
 </tr>
 <tr>