Remove >>> conflict markers.

[pspp-builds.git] / src / include.c

diff --git a/src/include.c b/src/include.c
index 19f5ca1b8f6f645219725e6993821d04fe788a53..7e3bacc6d7182ae913dc3ae553ffb61dffd7df39 100644 (file)
--- a/src/include.c
+++ b/src/include.c
@@ -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. */
 
 #include <config.h>
 #include <ctype.h>
@@ -40,7 +40,7 @@ cmd_include (void)
       lex_error (_("expecting filename")); 
       return CMD_FAILURE;
     }
-  getl_include (ds_value (&tokstr));
+  getl_include (ds_c_str (&tokstr));
 
   lex_get ();
   return lex_end_of_command ();