Skip to content

Commit

Permalink
Merge branch 'v3' of https://github.com/froala/knockout-froala into v…
Browse files Browse the repository at this point in the history
….3-changes

# Conflicts:
#	Requirejs Demo/index.html
  • Loading branch information
sharma-dark-knight committed Apr 23, 2019
2 parents a1ef90d + 2ef4487 commit 5749b83
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Requirejs Demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ <h3> Preview Output </h3>
requirejs.config({
'baseUrl': 'js/lib',
'paths': paths,
shim: shim
'shim': shim

});

// Load the main app module to start the app
Expand Down

0 comments on commit 5749b83

Please sign in to comment.