Merge branch 'main' of https://github.com/BlandineBajard/tp-figma-js
This commit is contained in:
commit
849c245499
1 changed files with 5 additions and 0 deletions
|
@ -22,7 +22,12 @@
|
|||
<div id="personne"></div>
|
||||
</section>
|
||||
|
||||
<<<<<<< HEAD
|
||||
<button id = "page2" style="background: url(https://github.com/BlandineBajard/tp-figma-js/blob/main/pagesuiv.png)"></button>
|
||||
<button id = "page1" style="background: url(https://github.com/BlandineBajard/tp-figma-js/blob/main/pageprec.jpg)"></button>
|
||||
=======
|
||||
<button id = "page1">page precedente</button>
|
||||
<button id = "page2">page suivante</button>
|
||||
>>>>>>> 94ce8e40fcf5a7e3adf7b66922b518b8b11a4335
|
||||
</body>
|
||||
</html>
|
Loading…
Add table
Reference in a new issue