[WWcvs] wwmoodle: fixed a left over conflict indicator

[Mike G. v. a. <we...@ma...>]

Log Message:
-----------
fixed a left over conflict indicator

Modified Files:
--------------
    wwmoodle/wwassignment4/moodle/blocks/wwlink:
        block_wwlink.php

Revision Data
-------------
Index: block_wwlink.php
===================================================================
RCS file: /webwork/cvs/system/wwmoodle/wwassignment4/moodle/blocks/wwlink/block_wwlink.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lwwassignment4/moodle/blocks/wwlink/block_wwlink.php -Lwwassignment4/moodle/blocks/wwlink/block_wwlink.php -u -r1.6 -r1.7
--- wwassignment4/moodle/blocks/wwlink/block_wwlink.php
+++ wwassignment4/moodle/blocks/wwlink/block_wwlink.php
@@ -28,7 +28,7 @@
         return array('all' => false, 'course-view' => true);
     }
     
-<<<<<<< block_wwlink.php
+
 function user_can_edit() {
 	require_capability('moode/site:doanything',get_context_instance(CONTEXT_SYSTEM));
 	return parent::user_can_edit();