search

ninjapanther / sm

0 stars 0 forks source link

Design to master #15

Closed jwaiswa7 closed 7 years ago

jwaiswa7 commented 7 years ago

To add design into master.

Created another branch for this operation, so that we don't affect the design branch..

ninjapanther commented 7 years ago

I tested . There seems conflict with db/schema.rb

I had to execute git rm db/schema.rb before I could pull the branch design_to_master in my laptop It them worked fine.no other conflicts