-
Notifications
You must be signed in to change notification settings - Fork 772
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(fxFlex): fxFlex=auto with overlapping breakpoints activated #183
Conversation
c47018b
to
e01a1ea
Compare
@d3viant0ne - plz review. |
.gitignore
Outdated
@@ -18,6 +18,8 @@ build/Release | |||
|
|||
# Users Environment Variables | |||
.lock-wscript | |||
yarn.lock |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As opposed to ignoring the lock file, I would suggest adding a .gitattributes
file and then treating it as a binary. Removes the merge conflict issue while still providing the ability to easily see any shifting dependencies upstream.
i.e
# .gitattributes
yarn.lock -diff
* text=auto
bin/* eol=lf
61e9b38
to
116ad70
Compare
116ad70
to
1ed376c
Compare
import {DemoIssue5345} from "./issue.5345.demo"; | ||
import {DemoIssue9897} from "./issue.9897.demo"; | ||
import {DemoIssue181} from './issue.181.demo'; | ||
import {DemoIssue5345} from "./issue.5345.demo"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these first 2 are double imported
Layout changes from gt-sm will not restore default layout with auto fixes #135.
1ed376c
to
f4b38c7
Compare
…lar#183) Layout changes from gt-sm will not restore default layout with auto fixes angular#135.
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Layout changes from gt-sm will not restore default layout with auto
fixes #135.