fixed conflicts and created a new branch

SocialHackersClass10 / ChalleduApp

This repository contains the Code of the project, ChalleduApp, as a result of the collaboration between SHA-students of Class 10 & Challedu.com.

1 stars 5 forks source link

Closed mouzakiskir closed 4 years ago

mouzakiskir commented 4 years ago

Old branch and pull request deleted

Stef-Lev commented 4 years ago

It seems to be working, the code seems OK. We could merge it.

mouzakiskir commented 4 years ago

i'm glad, thank you @Stef-Lev