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.

Sign up for GitHub

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

Jump to bottom

Unresolved conflict #16

Closed
nikeshmhr opened this issue Aug 3, 2019 · 0 comments
Closed

Unresolved conflict #16

nikeshmhr opened this issue Aug 3, 2019 · 0 comments

Comments

@nikeshmhr
Copy link

khalti-sdk-web/src/index.js

Lines 115 to 121 in e2fc993

<<<<<<< HEAD
this._config.source = "web";
this._widget.setAttribute("src", __WIDGET_URL__ || WIDGET_URL);
=======
this._config.source = "web";
this._widget.setAttribute("src", WIDGET_URL);
>>>>>>> 962757fbaf37fda388d26b0ddf832e6e895a70a4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@chapagainmanoj @nikeshmhr