Fixed conflicts by adding to my name's folder

n4cr · Dec 29, 2020 · Dec 12, 2020 · Dec 12, 2020 · Dec 12, 2020 · Dec 13, 2020
commit 0f905ea49de3aa9a36774903489d9a04afd231d0
diff --git a/hackyourrepo-app/css/style.css → hackyourrepo-app/Masoud/css/style.css b/hackyourrepo-app/css/style.css → hackyourrepo-app/Masoud/css/style.css
diff --git a/hackyourrepo-app/img/favicon.ico → hackyourrepo-app/Masoud/img/favicon.ico b/hackyourrepo-app/img/favicon.ico → hackyourrepo-app/Masoud/img/favicon.ico
diff --git a/hackyourrepo-app/img/hyf.png → hackyourrepo-app/Masoud/img/hyf.png b/hackyourrepo-app/img/hyf.png → hackyourrepo-app/Masoud/img/hyf.png
diff --git a/hackyourrepo-app/index.html → hackyourrepo-app/Masoud/index.html b/hackyourrepo-app/index.html → hackyourrepo-app/Masoud/index.html
diff --git a/hackyourrepo-app/js/script.js → hackyourrepo-app/Masoud/js/script.js b/hackyourrepo-app/js/script.js → hackyourrepo-app/Masoud/js/script.js