Merge branch 'namespace' of https://github.com/facebook/hack-codegen into namespace

alejandromarcu · alejandromarcu · commit 94a0403631ee · 2016-01-14T01:40:20.000Z
Conflicts:
	src/CodegenFile.php
diff --git a/src/CodegenFile.php b/src/CodegenFile.php
@@ -277,7 +277,6 @@ private function getContent(): string {
       'namespace %s;',
       $this->fileNamespace,
     );
-
     foreach ($this->useNamespaces as $ns => $as) {
       $builder->addLine($as === null ? "use $ns;" : "use $ns as $as;");
     }

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,6 @@ private function getContent(): string {`
`277`	`277`	`'namespace %s;',`
`278`	`278`	`$this->fileNamespace,`
`279`	`279`	`);`
`280`		`-`
`281`	`280`	`foreach ($this->useNamespaces as $ns => $as) {`
`282`	`281`	`$builder->addLine($as === null ? "use $ns;" : "use $ns as $as;");`
`283`	`282`	`}`