DanielRamirezGe
6 lines
2.9 KiB
HTML
6 lines
2.9 KiB
HTML
<<<<<<< HEAD
|
|
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//use.fontawesome.com/releases/v5.0.7/css/all.css><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap" rel=stylesheet><link rel=stylesheet href=path/to/font-awesome/css/font-awesome.min.css><script src=https://cdn.jsdelivr.net/npm/vue@2.5.16/dist/vue.js></script><link rel=stylesheet href=https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css><script src=https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js></script><script src=https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js></script><script src=https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js></script><script src=sweetalert2.all.min.js></script><title>Red de investigacion</title><link href=css/app.8e81b814.css rel=preload as=style><link href=css/chunk-vendors.c580d68a.css rel=preload as=style><link href=js/app.778ed279.js rel=preload as=script><link href=js/chunk-vendors.1a532696.js rel=preload as=script><link href=css/chunk-vendors.c580d68a.css rel=stylesheet><link href=css/app.8e81b814.css rel=stylesheet></head><body><noscript><strong>We're sorry but first doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.1a532696.js></script><script src=js/app.778ed279.js></script></body></html>
|
|
=======
|
|
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//use.fontawesome.com/releases/v5.0.7/css/all.css><link href="https://fonts.googleapis.com/css?family=Roboto:300,400,700&display=swap" rel=stylesheet><link rel=stylesheet href=https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css><script src=https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js></script><script src=https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js></script><script src=https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js></script><title>Red de investigacion</title><link href=css/app.2f149bbe.css rel=preload as=style><link href=css/chunk-vendors.c580d68a.css rel=preload as=style><link href=js/app.28b1b8f9.js rel=preload as=script><link href=js/chunk-vendors.1a532696.js rel=preload as=script><link href=css/chunk-vendors.c580d68a.css rel=stylesheet><link href=css/app.2f149bbe.css rel=stylesheet></head><body><noscript><strong>We're sorry but first doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=js/chunk-vendors.1a532696.js></script><script src=js/app.28b1b8f9.js></script></body></html>
|
|
>>>>>>> 3b79e14db98a5f9cee0f58d3a211e30fd1d0fcf7
|