Merge branch 'master' of https://github.com/blueappio/demo

saket424 · Apr 11, 2017 · e60ce1a · e60ce1a
2 parents 8e944e1 + 59b71a7
commit e60ce1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app.js b/app.js
@@ -42,7 +42,7 @@ function mainController($scope) {
             })
             .then(data => {
                 // Got the value. Let's use it in our application.
-                main.Data = dataToString(data);
+                main.Manufacturer = dataToString(data);
                 $scope.$apply();
             })
             .catch(error => {

diff --git a/index.html b/index.html
@@ -17,7 +17,7 @@ <h2>Demo</h2>
             Id: {{main.Id}}
         </li>
         <li>
-            Data: {{main.Data}}
+            Manufacture Name: {{main.Manufacturer}}
         </li>
     </ul>
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,7 @@ <h2>Demo</h2> @@
                 Id: {{main.Id}}
             </li>
             <li>
-                Data: {{main.Data}}
+                Manufacture Name: {{main.Manufacturer}}
             </li>
         </ul>
     </div>
@@ Expand Down @@