fixed missing public: in...

fixed missing public: in src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H

src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H

@@ -57,13 +57,15 @@ class shifted
 
         scalar e_at_rCut_;
 
+<<<<<<< HEAD:src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
 
+=======
+>>>>>>> fixed missing public: in src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H:src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
 public:
 
     //- Runtime type information
     TypeName("shifted");
 
-
     // Constructors
 
         //- Construct from components

wmake/src/lex.yy.c

@@ -342,9 +342,6 @@ FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
 typedef int yy_state_type;
 
 extern int yylineno;
-
-int yylineno = 1;
-
 extern char *yytext;
 #define yytext_ptr yytext
 
@@ -788,7 +785,7 @@ void importDirectory(const char* dirName);
 #   undef yywrap	/* sometimes a macro by default */
 
 
-#line 792 "lex.yy.c"
+#line 789 "lex.yy.c"
 
 #define INITIAL 0
 #define CMNT 1
@@ -952,7 +949,7 @@ YY_DECL
 #line 60 "wmkdep.l"
 
 
-#line 956 "lex.yy.c"
+#line 953 "lex.yy.c"
 
 	if ( !(yy_init) )
 		{
@@ -1135,7 +1132,7 @@ YY_RULE_SETUP
 #line 86 "wmkdep.l"
 ECHO;
 	YY_BREAK
-#line 1139 "lex.yy.c"
+#line 1136 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(CMNT):
 case YY_STATE_EOF(CFNAME):
@@ -1953,15 +1950,6 @@ static void yy_fatal_error (yyconst char* msg )
 
 /* Accessor  methods (get/set functions) to struct members. */
 
-/** Get the current line number.
- * 
- */
-int yyget_lineno  (void)
-{
-        
-    return yylineno;
-}
-
 /** Get the input stream.
  * 
  */
@@ -1995,16 +1983,6 @@ char *yyget_text  (void)
         return yytext;
 }
 
-/** Set the current line number.
- * @param line_number
- * 
- */
-void yyset_lineno (int  line_number )
-{
-    
-    yylineno = line_number;
-}
-
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.