diff options
| author | Robert Zorko <robertz@gurucue.com> | 2015-09-18 18:54:32 +0200 |
|---|---|---|
| committer | Robert Zorko <robertz@gurucue.com> | 2015-09-18 18:54:32 +0200 |
| commit | d1445d6af226de21ecf513ff7aff7d6f7bb82b1c (patch) | |
| tree | 7a448edac2d6b66feb8979e97ccd7e4ba5e3f6d3 /index.html | |
| parent | 9113815d16d38373b378c6d34000a75f019b219f (diff) | |
| parent | 5ae5ffc6e86a0181799b6f45167bfb57ea91a32c (diff) | |
merge conflict occured and is now fixed
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -15,6 +15,7 @@ <!-- App --> <link rel="stylesheet" href="css/codeq.css" type="text/css"> <link rel="stylesheet" href="css/codeq/console.css" type="text/css"> + <link rel="stylesheet" href="css/codeq/hint.css" type="text/css"> <title>CodeQ</title> </head> <body> @@ -126,6 +127,7 @@ <div class="col-lg-3 col-md-6 col-sm-12 block" id="code_editor_outer_div"> <nav class="navbar navbar-default" id="block-toolbar"> <div class="container-fluid"> + <button type="button" class="btn btn-default navbar-btn" id="btn_code_plan">Plan</button> <button type="button" class="btn btn-default navbar-btn" id="btn_code_hint">Hint</button> <button type="button" class="btn btn-default navbar-btn" id="btn_code_test">Test</button> </div> |