Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 50fa1ea64203269c2e7510163e1fda2ee25e05cf https://github.com/phpmyadmin/phpmyadmin/commit/50fa1ea64203269c2e7510163e1f... Author: Isaac Bennetch bennetch@gmail.com Date: 2019-03-02 (Sat, 03 March 2019) -05:00

Changed paths: D po/en_US@rude.po

Log Message: ----------- Remove en_US@rude.po. This seems to have been created by mistake.

Signed-off-by: Isaac Bennetch bennetch@gmail.com

Commit: c3e79158b260811b519aee74f2f297941712c986 https://github.com/phpmyadmin/phpmyadmin/commit/c3e79158b260811b519aee74f2f2... Author: Isaac Bennetch bennetch@gmail.com Date: 2019-03-02 (Sat, 03 March 2019) -05:00

Changed paths: D po/en_US@rude.po

Log Message: ----------- Fix merge conflicts.

Remove en_US@rude.po. This seems to have been created by mistake.

Signed-off-by: Isaac Bennetch bennetch@gmail.com