]> source.dussan.org Git - sonarqube.git/commit
Fix bad merge
authorStas Vilchik <vilchiks@gmail.com>
Fri, 18 Jul 2014 10:36:40 +0000 (16:36 +0600)
committerStas Vilchik <vilchiks@gmail.com>
Fri, 18 Jul 2014 10:36:51 +0000 (16:36 +0600)
commite75cc2d845fd0fac42797b460063a1827533956f
tree84c2b68424dc35664df66ba5d654a26a161b9bd4
parent4232affa985c379616b2a6ae52fdfabe753d48b2
Fix bad merge
22 files changed:
sonar-server/src/main/hbs/common/_markdown-tips.hbs [deleted file]
sonar-server/src/main/java/org/sonar/server/test/ws/TestsShowAction.java [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Bold-webfont.eot [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Bold-webfont.svg [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Bold-webfont.ttf [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Bold-webfont.woff [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Light-webfont.eot [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Light-webfont.svg [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Light-webfont.ttf [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Light-webfont.woff [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Medium-webfont.eot [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Medium-webfont.svg [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Medium-webfont.ttf [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Medium-webfont.woff [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Regular-webfont.eot [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Regular-webfont.svg [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Regular-webfont.ttf [deleted file]
sonar-server/src/main/webapp/fonts/Roboto-Regular-webfont.woff [deleted file]
sonar-server/src/main/webapp/fonts/sonar.eot [deleted file]
sonar-server/src/main/webapp/fonts/sonar.svg [deleted file]
sonar-server/src/main/webapp/fonts/sonar.ttf [deleted file]
sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data.json [deleted file]