Skip to content

i added my son #47

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

Merged
oohwooh merged 14 commits into from
Jul 19, 2026
+9 −1
Merged

i added my son #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d24edd0
i added my son
elizzakai Jul 18, 2026
3d4552d
neme is now name
elizzakai Jul 18, 2026
260e9f1
updated jpeg file name
elizzakai Jul 18, 2026
09f6ea2
I just made him mao instead now
elizzakai Jul 18, 2026
3bab87a
ds
elizzakai Jul 18, 2026
91125bb
ds
elizzakai Jul 18, 2026
abc752d
changes
elizzakai Jul 18, 2026
a8e37ec
meep
elizzakai Jul 18, 2026
1f70f5e
ignore idea too
elizzakai Jul 18, 2026
01cfe7d
added more descriptors to said cat-cow
elizzakai Jul 18, 2026
f6ad568
more spaceee
elizzakai Jul 18, 2026
22d057d
update mao
elizzakai Jul 18, 2026
064106a
Merge branch 'main' into elizza-cow
hawa-mani Jul 18, 2026
fa184fc
rm DS_Store, ordered , updated .gitignore to match
elizzakai Jul 19, 2026
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop

@oohwooh oohwooh Jul 19, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is redundant, can you remove it? (I think it's due to automatic merge? Since I made the .gitignore after your fork)

@hawa-mani hawa-mani Jul 19, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oki -- will remove this update

@hawa-mani hawa-mani Jul 19, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I also made a .gitignore yesterday on my end -- but lemme know if I should do anything moore here --
I think the only thing I changed was to match the ordering of it in codeday:main

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.idea
.DS_Store
.DS_Store
8 changes: 8 additions & 0 deletions cows/mao.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"name": "Mao",
"breed": "Maine Coon",
"image": "images/mao.png",
"description": "He's a fish-cat. He's also a virgo"
}


Binary file added images/mao.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading