search

fossasia / susi_server

SUSI.AI server backend - the Artificial Intelligence server for personal assistants https://susi.ai
GNU Lesser General Public License v2.1
2.5k stars 1.08k forks source link

Master and Development have diverged #1465

Open iamareebjamal opened 4 years ago

iamareebjamal commented 4 years ago

Due to some wrong merges, master and development branches have diverged by about 300 commits. This needs to be fixed so that merges to and fro are not affected in future. If development is in latest stage and ready, it should be forced pushed to master, or some other solution should be applied