Skip to content
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

Update from Original #5

Closed
wants to merge 3 commits into from
Closed

Update from Original #5

wants to merge 3 commits into from

Conversation

dtc7240
Copy link

@dtc7240 dtc7240 commented Nov 16, 2017

No description provided.

These files in the dist folder I believe are overwritten every time
gulp build is run, so they just don’t matter … but I can’t Update from
formio/master unless I do something with them.
# Conflicts:
#	dist/lib/formio-full.js
#	dist/lib/formio-full.min.css
#	dist/lib/formio-full.min.js
@dtc7240
Copy link
Author

dtc7240 commented Nov 16, 2017

Oops ... sorry ... got the pull request going the wrong way!!!!

@dtc7240 dtc7240 closed this Nov 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant