Browse Source

resolve conflict: use locale image

master
hoschi-it 2 years ago
parent
commit
9312b0fa8d
  1. 8
      src/index.html

8
src/index.html

@ -10,15 +10,7 @@
<body>
<header id="header">
<<<<<<< HEAD
<img id="header-img"
src="https://gist.githubusercontent.com/hoschi-it/a2548051ddf33f975e37c2a7fdf31555/raw/1d38556e6e1fcb46525d69a9baaa3d2382c98e56/duck.svg"
alt="duck icon"
title="Icon made by Freepik from www.flaticon.com"
/>
=======
<img id="header-img" src="assets/duck.svg" alt="duck icon"> </img>
>>>>>>> 7aa4c9935811b76fe1dda7400c3a92ca2d26bb8f
<h1>Rubber ducks</h1>
<nav id="nav-bar">

Loading…
Cancel
Save