search

coreui / coreui-icons

CoreUI Free Icons - Premium designed free icon set with marks in SVG, Webfont and raster formats
https://coreui.io/icons/
Other
1.99k stars 153 forks source link

Dist contains git merge conflicts #12

Closed jameswilson closed 4 years ago

jameswilson commented 4 years ago

When I installed coreui-free-bootstrap-admin-template on branch v3-next and ran npm run build the free.min.css file inside the resulting dist/vendors/@coreui/icons/css/ folder contains git merge conflicts:

Screen Shot 2020-02-04 at 5 18 29 AM 
@charset "UTF-8";/*!
<<<<<<< HEAD:scss/free.scss
 * CoreUI Icons Free - Open Source Icons
 * @version v0.4.1
=======
 * CoreUI Icons Free Open Source Icons
 * @version v1.0.0-beta.3
>>>>>>> v1-next:scss/free/free-icons.scss
 * @link https://coreui.io/icons
 * Copyright (c) 2019 creativeLabs Łukasz Holeczek
 * Licensed under MIT (https://coreui.io/icons/license)
 */@font-face{font-family:CoreUI-Icons-Free;src:url(../
jameswilson commented 4 years ago

Problem is here:

https://github.com/coreui/coreui-icons/blob/7b74ca00be8704704117a7385523fe09970d5ad5/scss/free/free-icons.scss#L1-L12

mrholek commented 4 years ago

@jameswilson I will fix it today.

mrholek commented 4 years ago

@jameswilson solved!