Fixed: Mergefehler in js-file (f73c3b19) · Commits · open-source / MetaGer · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MetaGer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

f73c3b19

Commit f73c3b19 authored 7 years ago by Aria Givi

Downloads
- Patches
- Plain Diff

Fixed: Mergefehler in js-file

parent fda55a2c

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

public/js/searchbar.js 2 additions, 1 deletion

public/js/searchbar.js
resources/assets/js/searchbar.js 11 additions, 3 deletions

resources/assets/js/searchbar.js
resources/assets/less/metager/searchbar.less 6 additions, 6 deletions

resources/assets/less/metager/searchbar.less
resources/views/parts/searchbar.blade.php 1 addition, 1 deletion

resources/views/parts/searchbar.blade.php

with 20 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment