Skip to content
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

resolved conflict #165

Merged
merged 6 commits into from
Jan 14, 2025
Merged

resolved conflict #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4105e1c
Create shristi.txt
Shristi0124 Dec 22, 2024
be4b3d0
info.md
Shristi0124 Dec 28, 2024
b5915c0
Merge branch 'opencodeiiita:main' into main
Shristi0124 Dec 29, 2024
18956ca
added name of favourite actor
Shristi0124 Jan 3, 2025
430f3ce
added 2 hit films
Shristi0124 Jan 3, 2025
9450c61
added 2 flop films
Shristi0124 Jan 3, 2025
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
14 changes: 14 additions & 0 deletions CONTRIBUTORS/UTU/B-tech/shristi/info.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
About Me:-
Hello! I’m Shristi, a third-year undergraduate student of Women Instituted of Technology from Uttarakhand Technical University ,Dehradun Uttrakhand,pursuing B tech (computer science and technology) I am passionate about technology and constantly look for opportunities to expand my skills.I enjoy working on projects that combine real-world applications with cutting-edge technology

Academic Details
Institution: Women Instituted of Technology
University : Uttarakhand Technical University
Program: Bachelor of Technology (CSE)
Year: 3rd Year
Technical Interests
Web Development: Experienced in building full-stack applications with React, Node.js, and MongoDB.
Machine Learning: Enthusiastic about applying ML techniques in speech and image recognition projects.
Open Source: Actively contributing to open-source projects as part of Opencode24.
Hobbies
Movies and Music: I love exploring Science Fiction, Horror, and Thriller genres in films. Listening to music is another favorite pastime.
5 changes: 5 additions & 0 deletions Task-2/shristi.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ashok selvan
blue Star
Por thozhil
Bhadram
144