search

GreatDevelopers / LibreHatti

An E-Commerce cum CRM Django App
http://greatdevelopers.github.io/LibreHatti/
GNU General Public License v2.0
24 stars 61 forks source link

D2.0p3.6 #533

Closed lakshaychopra closed 4 years ago

lakshaychopra commented 4 years ago

Updated Dockerfile and docker-compose.yml files. settings.py file is updates to run in dockerised environment. Added missing requirements in requirements.txt file.

jasvir99 commented 4 years ago

@lakshaychopra Please rebase your branch.

lakshaychopra commented 4 years ago

@lakshaychopra Please rebase your branch.

Getting conflicts in rebasing the branch. Should I skip those commits showing conflicts.

jasvir99 commented 4 years ago

@lakshaychopra You have to fix the conflicts

lakshaychopra commented 4 years ago

@lakshaychopra You have to fix the conflicts

@jasvir99 i have rebased my master branch.

jasvir99 commented 4 years ago

@lakshaychopra You have to fix pre-commits checks also. Please refer https://github.com/GreatDevelopers/LibreHatti#raising-pull-request

jasvir99 commented 4 years ago

Also, I don't see the description and title updated.

jasvir99 commented 4 years ago

I'll update it by myself. Thanks for your help. I am closing this PR.