Remove >>> conflict markers.

[pspp-builds.git] / src / group.h

diff --git a/src/group.h b/src/group.h
index 984523574212b27976f1da54f3adc58b7a97047d..a066348646b2cd6f74633c6280d9eb93f8db592a 100644 (file)
--- a/src/group.h
+++ b/src/group.h
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 
 #ifndef GROUP_H
@@ -74,7 +74,7 @@ struct group_statistics
 
 
 
-/* These funcs are usefull for hash tables */
+/* These funcs are useful for hash tables */
 
 /* Return -1 if the id of a is less than b; +1 if greater than and 
    0 if equal */