angular-ui/bootstrap — pull request #926 by afj176 (2013-08-31 17:38:56+00:00)
Title: cleanup demo conflict markers

cleaned up conflict markers and removed the code that was to be discarded