Skip to content

Merge3 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Warg43 wants to merge 17 commits into
base: QA
Choose a base branch
from
Open

Merge3 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1c6ddd0
eeee
jonathanlr87 May 9, 2024
f1fcd8f
dsadas
jonathanlr87 May 9, 2024
33cf95b
dfsdf
jonathanlr87 May 9, 2024
8c9806f
Merge branch 'main' into Prueba_Claudia
jonathanlr87 May 9, 2024
e830e1f
trt
jonathanlr87 May 9, 2024
ec134be
das
jonathanlr87 May 9, 2024
928ec66
Revert "das"
jonathanlr87 May 9, 2024
1f4f063
sdas
jonathanlr87 May 9, 2024
38d69f8
Merge pull request #2 from Warg43/Prueba_Claudia
Warg43 May 9, 2024
b285576
Revert "das"
jonathanlr87 May 9, 2024
0494061
Revert "sdas"
jonathanlr87 May 9, 2024
7fa8580
Merge pull request #3 from Warg43/Prueba_Claudia
Warg43 May 9, 2024
ab6d879
prueba_merge (#4)
Warg43 May 9, 2024
0d279e1
dfs
Warg43 May 9, 2024
74590e9
Merge branch 'QA' into Merge3
Warg43 May 9, 2024
01972bc
Merge branch 'QA' into Merge3
Warg43 May 9, 2024
1015a1d
dasd
Warg43 May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,26 @@
A project based learning activity for people who are getting started with Git and GitHub.
fffffffffffffffffffffffffffffffffffffffffffff
You can play the game at: https://githubschool.github.io/github-games/

gfhdfgjhfgsjhdgfjshdgfjhgsdfjh
>> _*SUPPORTED BROWSERS*: Chrome, Firefox, Safari, Opera and IE9+_ prueba de ejercicio
LA MISMA PRUEBA
This fun open source game was cloned from: https://github.com/jakesgordon/javascript-tetris


merge 33333333333333333333333333333
=======

mnbmnbmnbmnbmnbmnbnmfdsdf
merge 1
nbmnbmnbmnbnmfdsdf
merge 2
nbmnbmnbmnbnmfdsdf
merge 3
=======

nbmnbmnbmnbnmfdsdf
merge 4

=======
merge 5

2 changes: 1 addition & 1 deletion index.html → William.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Javascript Tetris</title>
<title>Javascript Tetris prueba</title>
<style>
body { font-family: Helvetica, sans-serif; }
#tetris { margin: 1em auto; padding: 1em; border: 4px solid black; border-radius: 10px; background-color: #F8F8F8; }
Expand Down