Merging unwanted conflict on GC branch gc
authorJaroslav Tulach <jtulach@netbeans.org>
Tue, 09 Dec 2014 07:23:22 +0100
branchgc
changeset 8905bea583947da
parent 877 75fff3637abe
parent 880 ac1d06a4a36d
child 892 de02b7c13379
Merging unwanted conflict on GC branch
ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java
     1.1 --- a/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java	Mon Dec 08 21:04:35 2014 +0100
     1.2 +++ b/ko4j/src/main/java/org/netbeans/html/ko4j/Knockout.java	Tue Dec 09 07:23:22 2014 +0100
     1.3 @@ -178,7 +178,8 @@
     1.4          + "      var self = ret['ko4j'];\n"
     1.5          + "      if (!self) return;\n"
     1.6          + "      var model = val['ko4j'];\n"
     1.7 -        + "      self.@org.netbeans.html.ko4j.Knockout::setValue(ILjava/lang/Object;)(index, model ? model : val);\n"
     1.8 +        + "      var s = ret['ko4j'];\n"
     1.9 +        + "      s.@org.netbeans.html.ko4j.Knockout::setValue(ILjava/lang/Object;)(index, model ? model : val);\n"
    1.10          + "    };\n"
    1.11          + "  };\n"
    1.12          + "  var cmpt = ko['computed'](bnd);\n"