search

ninjapanther / sm

0 stars 0 forks source link

User interface #6

Closed jwaiswa7 closed 7 years ago

jwaiswa7 commented 7 years ago

To Merge the created User Interface into the master branch.. @ldco2016 and @ninjapanther , please review and see if it will conflict with your work.

Thanks.

ninjapanther commented 7 years ago

it is fine..just few extra lines in gemfile and application.scss need to be removed

On Sat, Sep 9, 2017 at 12:55 PM, Dominion notifications@github.com wrote:

[image: Boxbe] https://www.boxbe.com/overview This message is eligible for Automatic Cleanup! (notifications@github.com) Add cleanup rule https://www.boxbe.com/popup?url=https%3A%2F%2Fwww.boxbe.com%2Fcleanup%3Fkey%3DIkoMotCs2CVctxS7tHZjc76lAN3L%252BUIr0YcX801qYvI%253D%26token%3DyINO4W7Eo38qEZ3mtAH7%252BcZwgxwPF628QV2TAV%252FSiKh2NQ%252FesuyCovKswTVHDbC2KtQauN6OVQy7gy%252FGg%252BE4gf3%252BUcb1isRiEyam56JNW%252BvyDqSvQD5aKJhpkfVO%252B7i2rtCIfwRD7W0ucDftEcAR7w%253D%253D&tc_serial=32657774552&tc_rand=2053649101&utm_source=stf&utm_medium=email&utm_campaign=ANNO_CLEANUP_ADD&utm_content=001 | More info http://blog.boxbe.com/general/boxbe-automatic-cleanup?tc_serial=32657774552&tc_rand=2053649101&utm_source=stf&utm_medium=email&utm_campaign=ANNO_CLEANUP_ADD&utm_content=001

@jwaiswa7 https://github.com/jwaiswa7 requested your review on: ninjapanther/sm#6 https://github.com/ninjapanther/sm/pull/6 User interface.

— You are receiving this because your review was requested. Reply to this email directly, view it on GitHub https://github.com/ninjapanther/sm/pull/6#event-1241787587, or mute the thread https://github.com/notifications/unsubscribe-auth/ANI03mKEaiwcfOtp4k96kkrzGe1Kaobuks5sgj2HgaJpZM4PR6ft .

-- manjusha skype: linuxmary

ldco2016 commented 7 years ago

Why would you remove SCSS? It says conflicts, it just needs to be overwritten by the most current and accurate code.

ninjapanther commented 7 years ago

I havent removed anything..I just tested on my laptop and told the fix The original code by Joshua is unchanged

http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail Virus-free. www.avg.com http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail <#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>

On Sat, Sep 9, 2017 at 9:38 PM, Daniel Cortes notifications@github.com wrote:

[image: Boxbe] https://www.boxbe.com/overview This message is eligible for Automatic Cleanup! (notifications@github.com) Add cleanup rule https://www.boxbe.com/popup?url=https%3A%2F%2Fwww.boxbe.com%2Fcleanup%3Fkey%3DPuiAgvCzjIyyVSV88SrNWkhSC1vnIfoGhs%252FAZitbrRI%253D%26token%3DCoP6uHvQXEOKI52yfpm5X3B%252FNpwlheyL7A7LmD4z9H1c%252FY9NT5UpRvIQ10vRPp%252Fdx2pNHRWqyl%252BWsovjlI4O9A5b67nuIa88my7MZyTKwXcvY467nWNcf5C3LyO8qgRojTLkQDUgw%252F4%252BeDnQ9mKxlA%253D%253D&tc_serial=32666295187&tc_rand=79041223&utm_source=stf&utm_medium=email&utm_campaign=ANNO_CLEANUP_ADD&utm_content=001 | More info http://blog.boxbe.com/general/boxbe-automatic-cleanup?tc_serial=32666295187&tc_rand=79041223&utm_source=stf&utm_medium=email&utm_campaign=ANNO_CLEANUP_ADD&utm_content=001

Why would you remove SCSS? It says conflicts, it just needs to be overwritten by the most current and accurate code.

— You are receiving this because your review was requested. Reply to this email directly, view it on GitHub https://github.com/ninjapanther/sm/pull/6#issuecomment-328286626, or mute the thread https://github.com/notifications/unsubscribe-auth/ANI03ukb_lKw7qmQeAKcDNl13f4BZaRWks5sgrgHgaJpZM4PR6ft .

-- manjusha skype: linuxmary

jwaiswa7 commented 7 years ago

Hi guys, has this merge been complete..

Other wise, hope you are fine..