| @@ -123,7 +123,7 @@ | ||
| 123 | 123 | } | 
| 124 | 124 | |
| 125 | 125 | /** | 
| 126 | - * @param $topLevelObject string | |
| 126 | + * @param string $topLevelObject string | |
| 127 | 127 | * @param $crudAction string | 
| 128 | 128 | * | 
| 129 | 129 | * Based on the values provided in the $topLevelObject and $crudAction | 
| @@ -129,6 +129,4 @@ | ||
| 129 | 129 | */ | 
| 130 | 130 | public function __toString() | 
| 131 | 131 |      { | 
| 132 | -        return implode(' ', $this->getJsyn()); | |
| 133 | - } | |
| 134 | -} | |
| 132 | +        return implode(' ', $this->getJsyn | |
| 135 | 133 | \ No newline at end of file | 
| @@ -129,6 +129,4 @@ | ||
| 129 | 129 | */ | 
| 130 | 130 | public function __toString() | 
| 131 | 131 |      { | 
| 132 | -        return implode(' ', $this->getJsyn()); | |
| 133 | - } | |
| 134 | -} | |
| 132 | +        return implode(' ', $this->getJsyn | |
| 135 | 133 | \ No newline at end of file | 
| @@ -129,6 +129,4 @@ | ||
| 129 | 129 | */ | 
| 130 | 130 | public function __toString() | 
| 131 | 131 |      { | 
| 132 | -        return implode(' ', $this->getJsyn()); | |
| 133 | - } | |
| 134 | -} | |
| 132 | +        return implode(' ', $this->getJsyn | |
| 135 | 133 | \ No newline at end of file | 
| @@ -129,6 +129,4 @@ | ||
| 129 | 129 | */ | 
| 130 | 130 | public function __toString() | 
| 131 | 131 |      { | 
| 132 | -        return implode(' ', $this->getJsyn()); | |
| 133 | - } | |
| 134 | -} | |
| 132 | +        return implode(' ', $this->getJsyn | |
| 135 | 133 | \ No newline at end of file | 
| @@ -57,7 +57,7 @@ discard block | ||
| 57 | 57 | |
| 58 | 58 |          if (isset($this->sqlSyntax)) { | 
| 59 | 59 | $sqlSyntax = $this->sqlSyntax; | 
| 60 | -<<<<<<< HEAD | |
| 60 | +<< << <<< HEAD | |
| 61 | 61 |              if (!isset($this->jsyn->$sqlSyntax)) { | 
| 62 | 62 | ======= | 
| 63 | 63 |              if (!isset($this->jsyn->$sqlSyntax)){ | 
| @@ -129,6 +129,4 @@ discard block | ||
| 129 | 129 | */ | 
| 130 | 130 | public function __toString() | 
| 131 | 131 |      { | 
| 132 | -        return implode(' ', $this->getJsyn()); | |
| 133 | - } | |
| 134 | -} | |
| 132 | +        return implode(' ', $this->getJsyn | |
| 135 | 133 | \ No newline at end of file | 
| @@ -129,6 +129,4 @@ | ||
| 129 | 129 | */ | 
| 130 | 130 | public function __toString() | 
| 131 | 131 |      { | 
| 132 | -        return implode(' ', $this->getJsyn()); | |
| 133 | - } | |
| 134 | -} | |
| 132 | +        return implode(' ', $this->getJsyn | |
| 135 | 133 | \ No newline at end of file | 
| @@ -129,6 +129,4 @@ | ||
| 129 | 129 | */ | 
| 130 | 130 | public function __toString() | 
| 131 | 131 |      { | 
| 132 | -        return implode(' ', $this->getJsyn()); | |
| 133 | - } | |
| 134 | -} | |
| 132 | +        return implode(' ', $this->getJsyn | |
| 135 | 133 | \ No newline at end of file |