Commit 0bbe7841 authored by guptasuuraj's avatar guptasuuraj
Browse files

Resolve merge conflicts

parents ced3fca2 4c8c8d01

README.md

+12 −0
Original line number Diff line number Diff line 
<<<<<<< HEAD

# PoDS_Ass_Team18

=======

# PoDS_Ass_Team 18

>>>>>>> 4c8c8d01a16a5eaf91ad7980d7609fa2b7c0a5af
@@ -15,14 +19,22 @@ Already a pro? Just edit this README.md and make it your own. Want to make it ea 


```

cd existing_repo

<<<<<<< HEAD

git remote add origin https://aidaho-edu.uni-hohenheim.de/gitlab/guptasuuraj/pods_ass_team18.git

=======

git remote add origin https://aidaho-edu.uni-hohenheim.de/gitlab/guptasuuraj/pods_ass_team-18.git

>>>>>>> 4c8c8d01a16a5eaf91ad7980d7609fa2b7c0a5af

git branch -M main

git push -uf origin main

```



## Integrate with your tools



<<<<<<< HEAD

* [Set up project integrations](https://aidaho-edu.uni-hohenheim.de/gitlab/guptasuuraj/pods_ass_team18/-/settings/integrations)

=======

* [Set up project integrations](https://aidaho-edu.uni-hohenheim.de/gitlab/guptasuuraj/pods_ass_team-18/-/settings/integrations)

>>>>>>> 4c8c8d01a16a5eaf91ad7980d7609fa2b7c0a5af



## Collaborate with your team