From e27e7ebe7fb83403b79559ba4d94bad059aa9dd7 Mon Sep 17 00:00:00 2001 From: Alex Gordon Date: Wed, 21 Jun 2017 15:56:32 -0400 Subject: [PATCH 1/3] fix pushed merge conflict --- README.md | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/README.md b/README.md index a07b435..9b4abb8 100644 --- a/README.md +++ b/README.md @@ -959,43 +959,18 @@ function randomId() { } export class Box { -<<<<<<< HEAD - @serializable(identifier()) - id = randomId(); - - @serializable - @observable - x = 0; - - @serializable - @observable - y = 0; - - @serializable - @observable - location = 0; - - constructor(location, x, y) { -======= @serializable(identifier()) id = randomId(); @serializable @observable x = 0; @serializable @observable y = 0; @serializable @observable location = 0; constructor(location, x, y){ ->>>>>>> Updated readme and changelog this.location = location; this.x = x; this.y = y; } -<<<<<<< HEAD - @serializable - @computed - get area() { -======= @serializable @computed get area() { ->>>>>>> Updated readme and changelog return this.x * this.y; } } From 6cf4df4b83f629d68ffb488f2362e5eea0e5dde3 Mon Sep 17 00:00:00 2001 From: Alex Gordon Date: Wed, 21 Jun 2017 16:00:59 -0400 Subject: [PATCH 2/3] clean up PR --- README.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9b4abb8..e5ea2f0 100644 --- a/README.md +++ b/README.md @@ -964,7 +964,7 @@ export class Box { @serializable @observable y = 0; @serializable @observable location = 0; - constructor(location, x, y){ + constructor(location, x, y) { this.location = location; this.x = x; this.y = y; @@ -976,14 +976,11 @@ export class Box { } export class Arrow { - @serializable(identifier()) - id = randomId(); + @serializable(identifier()) id = randomId(); - @serializable(reference(Box)) - from; + @serializable(reference(Box)) from; - @serializable(reference(Box)) - to; + @serializable(reference(Box)) to; } // store.js: From b086e14f23450bdb2d20977776deab1d8a4438ae Mon Sep 17 00:00:00 2001 From: Alex Gordon Date: Wed, 21 Jun 2017 16:01:42 -0400 Subject: [PATCH 3/3] remove spaces --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index e5ea2f0..3b98da1 100644 --- a/README.md +++ b/README.md @@ -977,9 +977,7 @@ export class Box { export class Arrow { @serializable(identifier()) id = randomId(); - @serializable(reference(Box)) from; - @serializable(reference(Box)) to; }