search

CodeforSouth / balance

:sleeping: A text message system for checking one's EBT card balance (SNAP benefits and more)
http://codeforamerica.org/apps/balance
MIT License
1 stars 2 forks source link

Add florida #7

Closed yamilethmedina closed 8 years ago

yamilethmedina commented 8 years ago

This doesn't have all of the old commits in it (plus I squashed some of mine), but when I try to merge with Code For America, it does. I've already rebased with their master--what else can I do?

yamilethmedina commented 8 years ago

This reasonable number of commits also occurs when I try to merge with CfA master; it's merging onto their add-florida branch that seems nearly impossible. I'm not sure how to handle the situation. Any ideas @ErnieAtLYD ?