Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts: Gemfile.lock app/controllers/admin/pages_controller.rb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
This commit is contained in:
commit
fe4c0986e7
|
@ -141,7 +141,6 @@
|
|||
});
|
||||
</script>
|
||||
<% end %>
|
||||
<<<<<<< HEAD
|
||||
|
||||
<!--Widget start-->
|
||||
<!-- <div id="sub-wiget">
|
||||
|
@ -530,5 +529,3 @@
|
|||
<button class="btn btn-primary" type="submit">Submit/送出</button>
|
||||
<button class="btn" type="reset">Cancel/取消</button>
|
||||
<!-- </div> -->
|
||||
=======
|
||||
>>>>>>> Fix bugs and changes for nccu
|
||||
|
|
Reference in New Issue