Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

Changes submitted #37

Open
wants to merge 55 commits into
base: HenryGBranch
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
0c3ae9c
hello
Aug 23, 2024
8c601db
Merge branch 'main' of https://github.com/simeon-demo/dsi_c4_playground
Aug 23, 2024
23e28e9
Merge branch 'main' of https://github.com/simeon-demo/dsi_c4_playground
Aug 23, 2024
10e3883
Merge remote-tracking branch 'refs/remotes/origin/main'
Aug 23, 2024
8e1aa7d
Merge branch 'main' of https://github.com/simeon-demo/dsi_c4_playground
Aug 23, 2024
d730060
Merge branch 'main' of https://github.com/simeon-demo/dsi_c4_playground
Aug 23, 2024
08416a7
sjl is making the change
sijiao-liu Aug 23, 2024
afc320d
Update README.md
markmaramag Aug 23, 2024
1bb7783
Update README.md
CarlosGD-CAN Aug 23, 2024
e753054
add my change
canadaronak Aug 23, 2024
fb0965b
Update yourfile.txt in Testbranch
TinaToronto Aug 23, 2024
f5a02f3
IM did a change
malkus1306 Aug 23, 2024
efe6f39
Add image of students studying at UofT
adastra21 Aug 23, 2024
89cd693
Merge branch 'main' into Testbranch
fbastos231 Aug 23, 2024
99ab1f4
Update README.md
NamreenSyed Aug 23, 2024
def0b4c
Merge pull request #20 from simeon-demo/Testbranch
TinaToronto Aug 23, 2024
1658196
Merge pull request #23 from simeon-demo/NamreenSyed-patch-1
NamreenSyed Aug 23, 2024
75041aa
test commit
ldanica Aug 23, 2024
96334d4
make readme changes
dtxe Aug 23, 2024
d4c4955
2nd change
malkus1306 Aug 23, 2024
ecdc988
Merge branch 'main' of https://github.com/simeon-demo/dsi_c4_playgrou…
malkus1306 Aug 23, 2024
2790277
Merge branch 'main' of https://github.com/simeon-demo/dsi_c4_playground
dtxe Aug 23, 2024
656a0f4
Merge pull request #22 from simeon-demo/add-image
adastra21 Aug 23, 2024
8b88b7a
Merge pull request #25 from simeon-demo/resolve_merge_conflict
simeon-demo Aug 23, 2024
6fed443
Merge pull request #28 from simeon-demo/IM_attempt
malkus1306 Aug 23, 2024
1e8af42
added a question.
ALEX8642 Aug 23, 2024
cdb711a
Merge pull request #33 from simeon-demo/hoseinbranch
hoseinaliyari Aug 23, 2024
80293ec
Added one line to nk branch
KathrynVozoris Aug 23, 2024
932747e
Merge pull request #35 from simeon-demo/CarlosGD-CAN-patch-1
CarlosGD-CAN Aug 23, 2024
f9dc87c
Merge branch 'main' into sjl
sijiao-liu Aug 23, 2024
7a8b380
Merge pull request #36 from simeon-demo/sjl
sijiao-liu Aug 23, 2024
abc3100
update README.md
dtxe Aug 23, 2024
632c6eb
Merge branch 'main' of https://github.com/simeon-demo/dsi_c4_playgrou…
dtxe Aug 23, 2024
c2b4998
Merge pull request #39 from simeon-demo/resolve_merge_conflict
simeon-demo Aug 23, 2024
b6a03ed
Merge pull request #42 from simeon-demo/nk
KathrynVozoris Aug 23, 2024
2296019
Merge branch 'main' into AlexChanges
ALEX8642 Aug 23, 2024
ac98ecd
Merge pull request #38 from simeon-demo/AlexChanges
ALEX8642 Aug 23, 2024
9b62a0a
Merge pull request #44 from simeon-demo/danica
ldanica Aug 23, 2024
3d000c3
Merge branch 'main' into hey_new_branch
nalcancia Aug 23, 2024
a3d21e8
Merge pull request #31 from simeon-demo/hey_new_branch
nalcancia Aug 23, 2024
3711af0
added dmytro_test.txt
OlenaBolokhonova Aug 23, 2024
0e79735
added dmytro_new.txt
OlenaBolokhonova Aug 23, 2024
1803fb8
Updated README.md
ldanica Aug 23, 2024
91373f4
Merge pull request #47 from simeon-demo/danica2
ldanica Aug 23, 2024
824e4cc
commit 3 (#48)
ldanica Aug 23, 2024
c1198d4
add misc.txt
Aug 23, 2024
79c9a89
misc changes
Aug 23, 2024
4ab1f3e
Merge pull request #49 from simeon-demo/mymiscchanges
CharlesColaco Aug 23, 2024
dba0f57
Update cinema.txt
Arezookhalili Aug 24, 2024
81e2e77
Merge pull request #50 from simeon-demo/Arezookhalili-patch-1
Arezookhalili Aug 24, 2024
10f4942
Merge pull request #51 from simeon-demo/dmytro_test
DmytroBolokhonov Aug 25, 2024
3b204da
Create hello_from_srujana
s-gunde Aug 28, 2024
8fe7281
Merge pull request #54 from simeon-demo/s-gunde-patch-1
s-gunde Aug 28, 2024
d57363c
Update README.md
s-gunde Aug 28, 2024
64b3403
Merge pull request #55 from simeon-demo/s-gunde-patch-2
s-gunde Aug 28, 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
3 changes: 3 additions & 0 deletions IM_playground/myfile2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
That's a new file in the new folder for the joint project

attempt 2
21 changes: 20 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,35 @@ Hello fellow human! This is a virtual playground for trying out git so that you

Remember: Once you're a master of Git, cha-ching!

aweofijaweofijaweiof
asdlkjfalweij

---

Hello team! this is a test.


Hello, this is also a test.

testing 123
=======
aweofiajweofijaweoifj

Hello, this is also a test.

hello :)

Not sure if this is working. LOL. From Carlos GD
Test. From Simeon.

edited from JP

Hello everyone - Toronto

hi can you see my change

This is Namreen

HELLO test 3


Hello..this is Srujana
3 changes: 2 additions & 1 deletion cinema.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
Hey!
It's Shayan, and it's just a random text file :)
It's Shayan, and it's just a random text file :)
yukcjcjj
1 change: 1 addition & 0 deletions dmytro_new.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
“Be careful not to choke on your aspirations, director.” —Darth Vader, Rogue One.
14 changes: 14 additions & 0 deletions dmytro_test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
When in the chronicle of wasted time
I see descriptions of the fairest wights,
And beauty making beautiful old rhyme
In praise of ladies dead, and lovely knights,
Then, in the blazon of sweet beauty’s best,
Of hand, of foot, of lip, of eye, of brow,
I see their antique pen would have express’d
Even such a beauty as you master now.
So all their praises are but prophecies
Of this our time, all you prefiguring;
And, for they look’d but with divining eyes,
They had not skill enough your worth to sing:
For we, which now behold these present days,
Had eyes to wonder, but lack tongues to praise.
6 changes: 6 additions & 0 deletions hello_from_srujana
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Hey, how it's going?
This is just a test file and thanks for checking in.


Best,
Srujana
1 change: 1 addition & 0 deletions hosein.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hello
1 change: 1 addition & 0 deletions misc.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Misc changes
9 changes: 9 additions & 0 deletions myfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,13 @@ It is a long established fact that a reader will be distracted by the readable c
Where does it come from?
Contrary to popular belief, Lorem Ipsum is not simply random text. It has roots in a piece of classical Latin literature from 45 BC, making it over 2000 years old. Richard McClintock, a Latin professor at Hampden-Sydney College in Virginia, looked up one of the more obscure Latin words, consectetur, from a Lorem Ipsum passage, and going through the cites of the word in classical literature, discovered the undoubtable source. Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum" (The Extremes of Good and Evil) by Cicero, written in 45 BC. This book is a treatise on the theory of ethics, very popular during the Renaissance. The first line of Lorem Ipsum, "Lorem ipsum dolor sit amet..", comes from a line in section 1.10.32.


What is the answer to life, the universe, everything?
=======
Hello, I wanted to add a comment here.

hello

test test test


1 change: 1 addition & 0 deletions nk
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hello nk!
Binary file added uoft-studying.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions yourfile.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@

something something but in latin

sjl is making the changes

Testbranch
Test for testbranch
# `Hello`

# Marcio was here!
main