qahive
diff --git a/‎index.html
Lines changed: 5 additions & 1 deletion b/‎index.html
Lines changed: 5 additions & 1 deletion
@@ -11,4 +11,8 @@
     })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
 
     ga('create', 'UA-106835747-2', 'auto');
-    ga('send', 'pageview');</script><title>Robot Framework</title><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name=description content="Generic test automation framework for acceptance testing and ATDD"><meta name=author content=""><link rel=apple-touch-icon sizes=76x76 href=/static/img/icons/apple-touch-icon.png><link rel=icon type=image/png sizes=32x32 href=/static/img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/img/icons/favicon-16x16.png><link rel=manifest href=/static/img/icons/site.webmanifest><link rel=mask-icon href=/static/img/icons/safari-pinned-tab.svg color=#5bbad5><meta name=msapplication-TileColor content=#da532c><meta name=theme-color content=#ffffff><link href=/static/css/app.8d1414f48f3e76d4697f72bc1dbc10d6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.14a76fad9b304f57d579.js></script><script type=text/javascript src=/static/js/vendor.2efd2cdea7175353f657.js></script><script type=text/javascript src=/static/js/app.763d6f93092f71bb4f4f.js></script></body></html>
+<<<<<<< HEAD
+    ga('send', 'pageview');</script><title>Robot Framework</title><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name=description content="Generic test automation framework for acceptance testing and ATDD"><meta name=author content=""><link rel=apple-touch-icon sizes=76x76 href=/static/img/icons/apple-touch-icon.png><link rel=icon type=image/png sizes=32x32 href=/static/img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/img/icons/favicon-16x16.png><link rel=manifest href=/static/img/icons/site.webmanifest><link rel=mask-icon href=/static/img/icons/safari-pinned-tab.svg color=#5bbad5><meta name=msapplication-TileColor content=#da532c><meta name=theme-color content=#ffffff><link href=/static/css/app.8d1414f48f3e76d4697f72bc1dbc10d6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.14a76fad9b304f57d579.js></script><script type=text/javascript src=/static/js/vendor.2efd2cdea7175353f657.js></script><script type=text/javascript src=/static/js/app.763d6f93092f71bb4f4f.js></script></body></html>
+=======
+    ga('send', 'pageview');</script><title>Robot Framework</title><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name=description content="Generic test automation framework for acceptance testing and ATDD"><meta name=author content=""><link rel=apple-touch-icon sizes=76x76 href=/static/img/icons/apple-touch-icon.png><link rel=icon type=image/png sizes=32x32 href=/static/img/icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=/static/img/icons/favicon-16x16.png><link rel=manifest href=/static/img/icons/site.webmanifest><link rel=mask-icon href=/static/img/icons/safari-pinned-tab.svg color=#5bbad5><meta name=msapplication-TileColor content=#da532c><meta name=theme-color content=#ffffff><link href=/static/css/app.8d1414f48f3e76d4697f72bc1dbc10d6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.14a76fad9b304f57d579.js></script><script type=text/javascript src=/static/js/vendor.2efd2cdea7175353f657.js></script><script type=text/javascript src=/static/js/app.c69d3f8fa8a54918b87b.js></script></body></html>
+>>>>>>> f2f9cc7dbc1a5bff531e09687d40248dc96e780a