From 2d1ede56a9a5d4981f6dcc1d57c94e0234f11c59 Mon Sep 17 00:00:00 2001
From: Joe Wheaton <joseph.wheaton@gmail.com>
Date: Tue, 8 Mar 2011 08:27:55 -0800
Subject: [PATCH] Issue #1085318: cleaned up file from merge info.

---
 quiz.actions.inc |   99 ++++++++++++------------------------------------------
 1 files changed, 22 insertions(+), 77 deletions(-)

diff --git a/quiz.actions.inc b/quiz.actions.inc
index 6fbc87b..87091b0 100644
--- a/quiz.actions.inc
+++ b/quiz.actions.inc
@@ -1,7 +1,4 @@
-<?php
-<<<<<<< quiz.actions.inc
-<<<<<<< quiz.actions.inc
-<<<<<<< quiz.actions.inc
+<?php
 /**
  * @file
  * Example Action Implementation.
@@ -19,7 +16,7 @@
 
 
 /**
- * Implements hook_action_info().
().
+ * Implementation of hook_action_info().
  * An action consists of two or three parts:
  * (1) an action definition (returned by this hook),
  * (2) a function which does the action
@@ -30,77 +27,25 @@
  */
 function quiz_action_info() {
   /*
-   //this is the name of your function to execute (custom_action)
-   //whatever your name here is you MUST have a function that matches
-   $info['custom_action'] = array(
-   //this is how we can filter the dropdown box on the quiz create page there will be an
-   //admin setting that will allow you to filter your dropdown results by 'type'
-   'type' => 'quiz',
-   //self explainatory
-   'description' => t('Custom Desription'),
-   //This allows you to configure your action with parameters through the admin
-   //If set to TRUE then you will need a custom form function for your options
-   'configurable' => TRUE,
-   //this will filter out actions based hooks, You will only use this if your going to get
-   //extremely advanced.
-   'hooks' => array(
-   'any' => TRUE,
-   ),
-   );
-   */
-=======
-=======
->>>>>>> 1.2
-=======
->>>>>>> 1.5
-/**
- * @file
- * Example Action Implementation.
- *
- * This does not provide functional code, but is an illustration of how actions can be created for
- * Quiz.
- *
- * This file was created with the intent of providing
- * some documentation for a good starting point when creating actions for utilization with
- * the quiz module.  Most of this documentation was taken from http://api.drupal.org, the API
- * documentation provided by Drupal.  For more understanding of these functions and hooks, please
- * see that Drupal API documentation for further reading.
- * @file
- */
-
-
-/**
- * Implementation of hook_action_info().
- * An action consists of two or three parts:
- * (1) an action definition (returned by this hook),
- * (2) a function which does the action
- *   (which by convention is named module + '_' + description of what the function does + '_action'),
- * (3) and an optional form definition function that defines a configuration form
- *   (which has the name of the action with '_form' appended to it.)
- *
- */
-function quiz_action_info() {
-  /*
-  //this is the name of your function to execute (custom_action)
-  //whatever your name here is you MUST have a function that matches
-  $info['custom_action'] = array(
-    //this is how we can filter the dropdown box on the quiz create page there will be an
-    //admin setting that will allow you to filter your dropdown results by 'type'
-    'type' => 'quiz',
-    //self explainatory
-    'description' => t('Custom Desription'),
-    //This allows you to configure your action with parameters through the admin
-    //If set to TRUE then you will need a custom form function for your options
-    'configurable' => TRUE,
-    //this will filter out actions based hooks, You will only use this if your going to get
-    //extremely advanced.
-    'hooks' => array(
-      'any' => TRUE,
-    ),
-  );
-  */
->>>>>>> 1.5
-  //return your array of actions
+  //this is the name of your function to execute (custom_action)
+  //whatever your name here is you MUST have a function that matches
+  $info['custom_action'] = array(
+    //this is how we can filter the dropdown box on the quiz create page there will be an
+    //admin setting that will allow you to filter your dropdown results by 'type'
+    'type' => 'quiz',
+    //self explainatory
+    'description' => t('Custom Desription'),
+    //This allows you to configure your action with parameters through the admin
+    //If set to TRUE then you will need a custom form function for your options
+    'configurable' => TRUE,
+    //this will filter out actions based hooks, You will only use this if your going to get
+    //extremely advanced.
+    'hooks' => array(
+      'any' => TRUE,
+    ),
+  );
+  */
+  //return your array of actions
   return $info;
 }
 /**
@@ -110,7 +55,7 @@ function quiz_action_info() {
  *
  */
 function quiz_custom_action() {
-  //perform your action here
+  //perform your action here
 }
 /**
  * Form for configurable Drupal action.
-- 
1.7.3.1