Merge remote-tracking branch 'origin/1.0'

GrahamCampbell · GrahamCampbell · commit 3222ed73ce80 · 2014-12-24T00:37:14.000Z
Conflicts:
	src/Navigation.php
	tests/NavigationTest.php
diff --git a/src/Facades/Navigation.php b/src/Facades/Navigation.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel Navigation by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/Navigation.php b/src/Navigation.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel Navigation by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/src/NavigationServiceProvider.php b/src/NavigationServiceProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel Navigation by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/AbstractTestCase.php b/tests/AbstractTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel Navigation by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/Facades/NavigationTest.php b/tests/Facades/NavigationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel Navigation by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/NavigationTest.php b/tests/NavigationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel Navigation by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/tests/ServiceProviderTest.php b/tests/ServiceProviderTest.php
@@ -1,6 +1,6 @@
 <?php
 
-/**
+/*
  * This file is part of Laravel Navigation by Graham Campbell.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-/**`
	`3`	`+/*`
`4`	`4`	`* This file is part of Laravel Navigation by Graham Campbell.`
`5`	`5`	`*`
`6`	`6`	`* Licensed under the Apache License, Version 2.0 (the "License");`