LMS: Fixed views for article and video
diff --git a/erpnext/www/lms/course.html b/erpnext/www/lms/course.html
index 9896b01..bd2d6b8 100644
--- a/erpnext/www/lms/course.html
+++ b/erpnext/www/lms/course.html
@@ -1,6 +1,7 @@
{% extends "frappe_theme/templates/base.html" %}
{% block title %}ERPNext Academy{% endblock %}
{% from "templates/includes/media.html" import media %}
+<<<<<<< HEAD
{% block head_include %}
<meta name="description" content="ERPNext Academy is a learnig platform to gain expertise in the world's top 100% open source ERP software." />
<meta name="keywords" content="ERP Software, Cloud ERP, Open Source ERP, Accounting Software, Online ERP, Online Accounting, ERP for small business, Learn ERP, ERPNext Academy, Learn ERPNext, Learn Accounting" />
@@ -10,6 +11,11 @@
{% with content = current_content, next_content = next_content, course_name = course_name, program_name = program_name %}
{% include "www/lms/templates/includes/" + content_type.lower() + ".html" %}
{% endwith %}
+=======
+{% block content %}
+<div id="content-holder" data-type="{{ content_type }}" data-content="{{ current_content.name }}" data-course="{{ course_name }}" data-program="{{ program_name }}">
+{% include "www/lms/templates/includes/" + content_type.lower() + ".html" %}
+>>>>>>> LMS: Fixed views for article and video
</div>
<style>
.footer-message {