CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-27 02:12:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

stub out iD.actions.MergeRemoteChanges

Browse Source
This commit is contained in:
Bryan Housel
2014-12-06 22:11:54 -05:00
parent 4088f2e70a
commit 3e97bd7d89
5 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/index.html
+2
View File
@@ -136,6 +136,7 @@
<script src='../js/id/actions/join.js'></script>
<script src='../js/id/actions/merge.js'></script>
<script src='../js/id/actions/merge_polygon.js'></script>
<script src='../js/id/actions/merge_remote_changes.js'></script>
<script src='../js/id/actions/move_node.js'></script>
<script src='../js/id/actions/move.js'></script>
<script src='../js/id/actions/noop.js'></script>
@@ -235,6 +236,7 @@
<script src="spec/actions/join.js"></script>
<script src='spec/actions/merge.js'></script>
<script src="spec/actions/merge_polygon.js"></script>
<script src="spec/actions/merge_remote_changes.js"></script>
<script src="spec/actions/move_node.js"></script>
<script src="spec/actions/move.js"></script>
<script src="spec/actions/noop.js"></script>
test/spec/actions/merge_remote_changes.js
+3
View File
@@ -0,0 +1,3 @@
describe("iD.actions.MergeRemoteChanges", function () {
// TODO
});